Skip to content

[stable29] fix(settings): show the correct initial locale in Personal info #50071

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
joshtrichards merged 1 commit into from
Jan 26, 2025
Merged

[stable29] fix(settings): show the correct initial locale in Personal info #50071

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
fix(settings): show the correct initial locale in Personal info 
Signed-off-by: Josh <[email protected]>
  • Loading branch information
@joshtrichards @AndyScherzinger
joshtrichards authored and AndyScherzinger committed Jan 26, 2025
commit cb4c2adafa45aa34977ed85339e130a51ce441fc
2 changes: 1 addition & 1 deletion apps/settings/lib/Settings/Personal/PersonalInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,8 @@ private function getLocaleMap(IUser $user): array {
}

$uid = $user->getUID();
$userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale());
$userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
$userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale($userLang));
$localeCodes = $this->l10nFactory->findAvailableLocales();
$userLocale = array_filter($localeCodes, fn ($value) => $userLocaleString === $value['code']);

Expand Down
Loading