mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7712 from nextcloud/jsconfig_l10n 

Use correct L10N files for jsconfig
This commit is contained in:
Morris Jobke 2018-01-05 15:22:10 +01:00 committed by GitHub
parent 62656dc5c2 30ac28f950
commit 68e205e827
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/Controller/OCJSController.php
View File

@ -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 {
* *
* @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 {
*/ */
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 {
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,

2
lib/private/TemplateLayout.php
View File

@ -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(),