Use correct L10N files for jsconfig

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/core/Controller/OCJSController.php b/core/Controller/OCJSController.php
index 9c19f0c0adf0b0445167402395ca548472fc7e6c..dc3071b0e79dd7952638ad9b5df57d889ca439d8 100644 (file)
--- 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 dcc0fd3ba67a80a72dedc1b1250dac1e75d406e0..8a3a8e1e36b709b3ce4d311cb229cd1ec9f185be 100644 (file)
--- 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(),