Merge pull request #7759 from nextcloud/7712_12
[stable12] Use correct L10N files for jsconfig
This commit is contained in:
commit
e1e06bf38f
|
@ -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,
|
||||
|
|
|
@ -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(),
|
||||
|
|
Loading…
Reference in New Issue