Skip to content

[stable17] Fix jsConfigHelper lang/locale mixup #17686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Oct 26, 2019
Merged

[stable17] Fix jsConfigHelper lang/locale mixup #17686

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0449d14
Don't pass in the locale as the language
rullzer Oct 25, 2019
7777c5f
Cleanup theming mess
rullzer Oct 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
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 <[email protected]>
  • Loading branch information
@rullzer
rullzer authored and Backportbot committed Oct 26, 2019
commit 0449d1457c91892d3c017af33aeecf846e2addce
3 changes: 1 addition & 2 deletions lib/private/TemplateLayout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ public function __construct( $renderAs, $appId = '' ) {
// 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);
Expand All @@ -164,7 +163,7 @@ public function __construct( $renderAs, $appId = '' ) {
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(),
Expand Down