Skip to content

add a fallback locale for personal settings page #18429

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 1 commit into from
Dec 17, 2019
+7 −0
Merged

add a fallback locale for personal settings page #18429

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
add a fallback locale for personal settings page 
otherwise if the locale is set to an invalid or no longer existing locale
the rendering of the setting page will throw an exception

Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Dec 16, 2019
commit db0bb8ae696a3d79f37ef3a13d6f70a7a01b50bf
7 changes: 7 additions & 0 deletions apps/settings/lib/Settings/Personal/PersonalInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,13 @@ private function getLocales(IUser $user) {
return 0 === strpos($localeCode['code'], $userLang);
});

if (!$userLocale) {
$userLocale = [
'code' => 'en',
'name' => 'English'
];
}

return [
'activelocaleLang' => $userLocaleString,
'activelocale' => $userLocale,
Expand Down