Merge pull request #40808 from c39cfbb3/patch-3

fix(L10N): Support "Accept-Language: zh-Hans-CN" and alike
nextcloud · Oct 18, 2023 · 1f8c21a · 1f8c21a
2 parents 1d9d3b6 + 1bf15da
commit 1f8c21a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php
@@ -490,10 +490,14 @@ private function getLanguageFromRequest(?string $app = null): string {
 				[$preferred_language] = explode(';', $preference);
 				$preferred_language = str_replace('-', '_', $preferred_language);
 
+				$preferred_language_parts = explode('_', $preferred_language);
 				foreach ($available as $available_language) {
 					if ($preferred_language === strtolower($available_language)) {
 						return $this->respectDefaultLanguage($app, $available_language);
 					}
+					if ($preferred_language_parts[0].'_'.end($preferred_language_parts) === strtolower($available_language)) {
+						return $available_language;
+					}
 				}
 
 				// Fallback from de_De to de