wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #18429 from nextcloud/locale-fallback

Browse source 
add a fallback locale for personal settings page
This commit is contained in:
Roeland Jago Douma 2019-12-17 12:31:17 +01:00 committed by GitHub
commit 7f2b3eabe1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/settings/lib/Settings/Personal/PersonalInfo.php
View file

@ -251,6 +251,13 @@ class PersonalInfo implements ISettings {
return 0 === strpos($localeCode['code'], $userLang); return 0 === strpos($localeCode['code'], $userLang);
}); });
if (!$userLocale) {
$userLocale = [
'code' => 'en',
'name' => 'English'
];
}
return [ return [
'activelocaleLang' => $userLocaleString, 'activelocaleLang' => $userLocaleString,
'activelocale' => $userLocale, 'activelocale' => $userLocale,