Support long locale in dynamic served js catalog

mozilla · Jan 22, 2025 · 13adf48 · 13adf48
1 parent 05fdf33
commit 13adf48
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/olympia/addons/tests/test_views.py b/src/olympia/addons/tests/test_views.py
@@ -7968,3 +7968,11 @@ def test_get_correct_catalog(self):
             '"Une erreur est survenue pendant l\\u2019envoi de votre fichier."'
             in content
         )
+
+    @pytest.mark.needs_locales_compilation
+    def test_long_locales(self):
+        for locale in ['en-US', 'sr-Latn', 'cak']:
+            url = reverse('javascript-catalog', kwargs={'locale': locale})
+            content = self.client.get(url).content.decode('utf-8')
+            assert 'There was an error uploading your file.' in content
+
diff --git a/src/olympia/urls.py b/src/olympia/urls.py
@@ -140,7 +140,7 @@ def serve_javascript_catalog(request, locale, **kwargs):
             ),
             # Serve javascript catalog locales bundle directly from django
             re_path(
-                r'^static/js/i18n/(?P<locale>\w+)\.js$',
+                r'^static/js/i18n/(?P<locale>\w{2,3}(?:-\w{2,6})?)\.js$',
                 serve_javascript_catalog,
                 name='javascript-catalog',
             ),