Merge pull request #500 from nextcloud/bugfix/100

nextcloud · Dec 7, 2023 · ec72510 · ec72510
2 parents da023ad + 1352a34
commit ec72510
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/WOPI/Parser.php b/lib/WOPI/Parser.php
@@ -269,6 +269,8 @@ private function getLanguageCode(): string {
 			return array_shift($languageMatches);
 		}
 
-		return 'en-US';
+		// Try to provide the language code matching RFC1766 format, if no language can be determined office will fallback to the browser language and then to en-US
+		// https://learn.microsoft.com/en-us/microsoft-365/cloud-storage-partner-program/online/discovery#ui_llcc
+		return str_replace('_', '-', $languageCode);
 	}
 }
diff --git a/tests/lib/WOPI/ParserTest.php b/tests/lib/WOPI/ParserTest.php
@@ -13,12 +13,17 @@ class ParserTest extends \Test\TestCase {
 	public function dataLanguage() {
 		return [
 			['de', 'de_DE', 'de-DE'],
-			['foo', 'de_DE', 'en-US'],
+			['foo', 'de_DE', 'foo'],
 			['en', 'en_US', 'en-US'],
 			['en', 'en_GB', 'en-gb'],
 			['en', 'de_DE', 'en-gb'],
 			['fr', 'fr_FR', 'fr-FR'],
 			['fr', 'fr_CA', 'fr-ca'],
+			['zh_CN', 'zh_CN', 'zh-CN'],
+			['zh_TW', 'zh_TW', 'zh-TW'],
+			['zh_CN', 'zh_Hans_CN', 'zh-CN'],
+			['zh_CN', 'zh_Hans_CN', 'zh-CN'],
+			['es_UY', 'es_UY', 'es-UY'],
 		];
 	}