Skip to content
Snippets Groups Projects
Unverified Commit 30ac28f9 authored by Roeland Jago Douma's avatar Roeland Jago Douma
Browse files

Use correct L10N files for jsconfig

parent 0280cff6
No related branches found
No related tags found
No related merge requests found
...@@ -34,11 +34,11 @@ use OCP\AppFramework\Http\DataDisplayResponse; ...@@ -34,11 +34,11 @@ use OCP\AppFramework\Http\DataDisplayResponse;
use OCP\Defaults; use OCP\Defaults;
use OCP\IConfig; use OCP\IConfig;
use OCP\IGroupManager; use OCP\IGroupManager;
use OCP\IL10N;
use OCP\IRequest; use OCP\IRequest;
use OCP\ISession; use OCP\ISession;
use OCP\IURLGenerator; use OCP\IURLGenerator;
use OCP\IUserSession; use OCP\IUserSession;
use OCP\L10N\IFactory;
class OCJSController extends Controller { class OCJSController extends Controller {
...@@ -50,7 +50,7 @@ class OCJSController extends Controller { ...@@ -50,7 +50,7 @@ class OCJSController extends Controller {
* *
* @param string $appName * @param string $appName
* @param IRequest $request * @param IRequest $request
* @param IL10N $l * @param IFactory $l10nFactory
* @param Defaults $defaults * @param Defaults $defaults
* @param IAppManager $appManager * @param IAppManager $appManager
* @param ISession $session * @param ISession $session
...@@ -62,7 +62,7 @@ class OCJSController extends Controller { ...@@ -62,7 +62,7 @@ class OCJSController extends Controller {
*/ */
public function __construct($appName, public function __construct($appName,
IRequest $request, IRequest $request,
IL10N $l, IFactory $l10nFactory,
Defaults $defaults, Defaults $defaults,
IAppManager $appManager, IAppManager $appManager,
ISession $session, ISession $session,
...@@ -74,7 +74,7 @@ class OCJSController extends Controller { ...@@ -74,7 +74,7 @@ class OCJSController extends Controller {
parent::__construct($appName, $request); parent::__construct($appName, $request);
$this->helper = new JSConfigHelper( $this->helper = new JSConfigHelper(
$l, $l10nFactory->get('lib'),
$defaults, $defaults,
$appManager, $appManager,
$session, $session,
......
...@@ -146,7 +146,7 @@ class TemplateLayout extends \OC_Template { ...@@ -146,7 +146,7 @@ class TemplateLayout extends \OC_Template {
if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') { if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') {
if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) { if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) {
$jsConfigHelper = new JSConfigHelper( $jsConfigHelper = new JSConfigHelper(
\OC::$server->getL10N('core'), \OC::$server->getL10N('lib'),
\OC::$server->query(Defaults::class), \OC::$server->query(Defaults::class),
\OC::$server->getAppManager(), \OC::$server->getAppManager(),
\OC::$server->getSession(), \OC::$server->getSession(),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment