|
|
|
|
@ -142,7 +142,6 @@ class TemplateLayout extends \OC_Template { |
|
|
|
|
// Send the language and the locale to our layouts |
|
|
|
|
$lang = \OC::$server->getL10NFactory()->findLanguage(); |
|
|
|
|
$locale = \OC::$server->getL10NFactory()->findLocale($lang); |
|
|
|
|
$localeLang = \OC::$server->getL10NFactory()->findLanguageFromLocale('lib', $locale); |
|
|
|
|
|
|
|
|
|
$lang = str_replace('_', '-', $lang); |
|
|
|
|
$this->assign('language', $lang); |
|
|
|
|
@ -164,7 +163,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('lib', $localeLang ?: $lang), |
|
|
|
|
\OC::$server->getL10N('lib'), |
|
|
|
|
\OC::$server->query(Defaults::class), |
|
|
|
|
\OC::$server->getAppManager(), |
|
|
|
|
\OC::$server->getSession(), |
|
|
|
|
|