summaryrefslogtreecommitdiffstats
path: root/apps/settings
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-12-17 12:31:17 +0100
committerGitHub <noreply@github.com>2019-12-17 12:31:17 +0100
commit7f2b3eabe1dc85736d27bb8b62bff01c3f71e462 (patch)
treed006d09bf5d5190049e43253247229f1bc1d7b98 /apps/settings
parent53f94b81015f00f4d8aecc825daaecd611267b33 (diff)
parentdb0bb8ae696a3d79f37ef3a13d6f70a7a01b50bf (diff)
downloadnextcloud-server-7f2b3eabe1dc85736d27bb8b62bff01c3f71e462.tar.gz
nextcloud-server-7f2b3eabe1dc85736d27bb8b62bff01c3f71e462.zip
Merge pull request #18429 from nextcloud/locale-fallback
add a fallback locale for personal settings page
Diffstat (limited to 'apps/settings')
-rw-r--r--apps/settings/lib/Settings/Personal/PersonalInfo.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/settings/lib/Settings/Personal/PersonalInfo.php b/apps/settings/lib/Settings/Personal/PersonalInfo.php
index ee309873969..646ad04b236 100644
--- a/apps/settings/lib/Settings/Personal/PersonalInfo.php
+++ b/apps/settings/lib/Settings/Personal/PersonalInfo.php
@@ -251,6 +251,13 @@ class PersonalInfo implements ISettings {
return 0 === strpos($localeCode['code'], $userLang);
});
+ if (!$userLocale) {
+ $userLocale = [
+ 'code' => 'en',
+ 'name' => 'English'
+ ];
+ }
+
return [
'activelocaleLang' => $userLocaleString,
'activelocale' => $userLocale,