diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2019-10-25 13:29:51 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-10-25 13:29:51 +0200 |
| commit | 6a560fd51eee392c9cbcca91eea3f2bb6a307f0c (patch) | |
| tree | d095f39b8ba35404035bddcbdc04a505c67656ec /lib | |
| parent | a1cc2b21cc4e8abc0aa04938429e73b7b1f66fef (diff) | |
| download | nextcloud-server-6a560fd51eee392c9cbcca91eea3f2bb6a307f0c.tar.gz nextcloud-server-6a560fd51eee392c9cbcca91eea3f2bb6a307f0c.zip | |
Don't pass in the locale as the language
This messes with the translation of the date names etc.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/TemplateLayout.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 94b39e951a5..e7809b5a39d 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -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(), |