diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-01-09 21:28:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 21:28:19 +0300 |
| commit | e1e06bf38f0a645809b02182942e0475126b766e (patch) | |
| tree | f02e169049a41776370a283881519f92164b62f0 | |
| parent | e6f8869c2cea0783147d9e3132101b60588bdcdf (diff) | |
| parent | e2c77e46ab9c12d1ba990ad1437065a48a1667d6 (diff) | |
Merge pull request #7759 from nextcloud/7712_12
[stable12] Use correct L10N files for jsconfig
| -rw-r--r-- | core/Controller/OCJSController.php | 8 | ||||
| -rw-r--r-- | lib/private/TemplateLayout.php | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/Controller/OCJSController.php b/core/Controller/OCJSController.php index 9c19f0c0adf..dc3071b0e79 100644 --- a/core/Controller/OCJSController.php +++ b/core/Controller/OCJSController.php @@ -31,11 +31,11 @@ use OCP\AppFramework\Http\DataDisplayResponse; use OCP\Defaults; use OCP\IConfig; use OCP\IGroupManager; -use OCP\IL10N; use OCP\IRequest; use OCP\ISession; use OCP\IURLGenerator; use OCP\IUserSession; +use OCP\L10N\IFactory; class OCJSController extends Controller { @@ -47,7 +47,7 @@ class OCJSController extends Controller { * * @param string $appName * @param IRequest $request - * @param IL10N $l + * @param IFactory $l10nFactory * @param Defaults $defaults * @param IAppManager $appManager * @param ISession $session @@ -59,7 +59,7 @@ class OCJSController extends Controller { */ public function __construct($appName, IRequest $request, - IL10N $l, + IFactory $l10nFactory, Defaults $defaults, IAppManager $appManager, ISession $session, @@ -71,7 +71,7 @@ class OCJSController extends Controller { parent::__construct($appName, $request); $this->helper = new JSConfigHelper( - $l, + $l10nFactory->get('lib'), $defaults, $appManager, $session, diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index dcc0fd3ba67..8a3a8e1e36b 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -143,7 +143,7 @@ class TemplateLayout extends \OC_Template { if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') { if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) { $jsConfigHelper = new JSConfigHelper( - \OC::$server->getL10N('core'), + \OC::$server->getL10N('lib'), \OC::$server->query(Defaults::class), \OC::$server->getAppManager(), \OC::$server->getSession(), |