Merge pull request #50071 from nextcloud/backport/49988/stable29

joshtrichards · web-flow · commit 3e66411eb513 · 2025-01-26T11:13:54.000-05:00
[stable29] fix(settings): show the correct initial locale in Personal info
diff --git a/apps/settings/lib/Settings/Personal/PersonalInfo.php b/apps/settings/lib/Settings/Personal/PersonalInfo.php
@@ -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']);
 

Original file line number	Diff line number	Diff line change
`@@ -324,8 +324,8 @@ private function getLocaleMap(IUser $user): array {`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`$uid = $user->getUID();`
`327`		`- $userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale());`
`328`	`327`	`$userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());`
	`328`	`+ $userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale($userLang));`
`329`	`329`	`$localeCodes = $this->l10nFactory->findAvailableLocales();`
`330`	`330`	`$userLocale = array_filter($localeCodes, fn ($value) => $userLocaleString === $value['code']);`
`331`	`331`