Use correct L10N files for jsconfig
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
4c92d096b8
commit
e2c77e46ab
|
@ -31,11 +31,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 {
|
||||||
|
|
||||||
|
@ -47,7 +47,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
|
||||||
|
@ -59,7 +59,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,
|
||||||
|
@ -71,7 +71,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,
|
||||||
|
|
|
@ -143,7 +143,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(),
|
||||||
|
|
Loading…
Reference in New Issue