Merge pull request #6111 from escattone/zh-hant-fallback-fix-1820

fix Traditional Chinese mappings

kitsune/sumo/i18n.py

@@ -13,6 +13,7 @@
 FALLBACK_LANGUAGE_URL_MAP = dict(
     (k.lower(), v if v else "en-US") for k, v in settings.NON_SUPPORTED_LOCALES.items()
 )
+MAP_TO_TRADITIONAL_CHINESE = frozenset(("zh-hant", "zh-hk", "zh-mo"))
 
 
 class LocalePrefixPattern(django.urls.LocalePrefixPattern):
@@ -101,6 +102,14 @@ def normalize_path(path, force_language=False):
         if force_language:
             return f"/{force_language}{remaining_path}"
         elif actual_language_from_path != normalized_language_from_path:
+            if (normalized_language_from_path == "zh-CN") and (
+                actual_language_from_path.lower() in MAP_TO_TRADITIONAL_CHINESE
+            ):
+                # Django will always map any unsupported Traditional Chinese locale, like
+                # "zh-hant" or "zh-hk" for example, into Simplified Chinese ("zh-cn") because
+                # we're not using "strict" mode, and "zh-cn" is always the first "zh-" match.
+                # For these specific cases we should be mapping to "zh-tw" instead.
+                normalized_language_from_path = "zh-TW"
             return f"/{normalized_language_from_path}{remaining_path}"
     elif force_language:
         return f"/{force_language}{path}"

kitsune/sumo/tests/test_locale_middleware.py

@@ -45,6 +45,27 @@ def test_upper_accept_lang(self):
         response = self.client.get("/search/", HTTP_ACCEPT_LANGUAGE="en-US,fr;q=0.3")
         self.assertRedirects(response, "/en-US/search/")
 
+    def test_traditional_chinese_mappings(self):
+        """'zh-hant' or 'zh-hk' should be mapped to 'zh-TW' instead of 'zh-CN'"""
+        with self.subTest("zh-hant"):
+            response = self.client.get("/zh-hant/search/")
+            self.assertRedirects(response, "/zh-TW/search/")
+        with self.subTest("zh-Hant"):
+            response = self.client.get("/zh-Hant/search/")
+            self.assertRedirects(response, "/zh-TW/search/")
+        with self.subTest("zh-hk"):
+            response = self.client.get("/zh-hk/")
+            self.assertRedirects(response, "/zh-TW/")
+        with self.subTest("zh-HK"):
+            response = self.client.get("/zh-HK/")
+            self.assertRedirects(response, "/zh-TW/")
+        with self.subTest("zh-mo"):
+            response = self.client.get("/zh-mo/")
+            self.assertRedirects(response, "/zh-TW/")
+        with self.subTest("zh-MO"):
+            response = self.client.get("/zh-MO/")
+            self.assertRedirects(response, "/zh-TW/")
+
 
 class PreferredLanguageTests(TestCase):
     def test_anonymous_change_language(self):