Merge pull request nextcloud#40808 from c39cfbb3/patch-3

susnux · web-flow · commit 1f8c21a58122 · 2023-10-18T03:43:26.000+02:00
fix(L10N): Support "Accept-Language: zh-Hans-CN" and alike
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

Original file line number	Diff line number	Diff line change
`@@ -490,10 +490,14 @@ private function getLanguageFromRequest(?string $app = null): string {`
`490`	`490`	`[$preferred_language] = explode(';', $preference);`
`491`	`491`	`$preferred_language = str_replace('-', '_', $preferred_language);`
`492`	`492`
	`493`	`+ $preferred_language_parts = explode('_', $preferred_language);`
`493`	`494`	`foreach ($available as $available_language) {`
`494`	`495`	`if ($preferred_language === strtolower($available_language)) {`
`495`	`496`	`return $this->respectDefaultLanguage($app, $available_language);`
`496`	`497`	`}`
	`498`	`+ if ($preferred_language_parts[0].'_'.end($preferred_language_parts) === strtolower($available_language)) {`
	`499`	`+ return $available_language;`
	`500`	`+ }`
`497`	`501`	`}`
`498`	`502`
`499`	`503`	`// Fallback from de_De to de`