Merge pull request #49988 from nextcloud/jtr-locale-personal-info

nickvergessen · web-flow · commit 17e89483606b · 2025-01-07T15:42:43.000+01:00
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
@@ -265,8 +265,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
`@@ -265,8 +265,8 @@ private function getLocaleMap(IUser $user): array {`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`$uid = $user->getUID();`
`268`		`- $userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale());`
`269`	`268`	`$userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());`
	`269`	`+ $userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale($userLang));`
`270`	`270`	`$localeCodes = $this->l10nFactory->findAvailableLocales();`
`271`	`271`	`$userLocale = array_filter($localeCodes, fn ($value) => $userLocaleString === $value['code']);`
`272`	`272`