Merge pull request #2989 from kyoshino/bug-1164781-spanish-fallback

Fix Bug 1164781 - Spanish locales are redirected to /en-US instead of /es when page is not localized

bedrock/settings/base.py

@@ -141,6 +141,15 @@ def get_dev_languages():
     'sv': 'sv-SE',
 }
 
+# Unlocalized pages are usually redirected to the English (en-US) equivalent,
+# but sometimes it would be better to offer another locale as fallback. This map
+# specifies such cases.
+FALLBACK_LOCALES = {
+    'es-AR': 'es-ES',
+    'es-CL': 'es-ES',
+    'es-MX': 'es-ES',
+}
+
 
 def lazy_lang_url_map():
     from django.conf import settings

lib/l10n_utils/__init__.py

@@ -59,13 +59,30 @@ def render(request, template, context=None, **kwargs):
 
             matched = None
 
+            # Look for the user's Accept-Language HTTP header to find another
+            # locale we can offer
             for lang in get_accept_languages(request):
                 if template_is_active(template, lang):
                     matched = lang
                     break
 
+            # Check for the fallback locales if the previous look-up doesn't
+            # work. This is useful especially in the Spanish locale where es-ES
+            # should be offered as the fallback of es, es-AR, es-CL and es-MX
+            if not matched:
+                for lang in get_accept_languages(request):
+                    lang = settings.FALLBACK_LOCALES.get(lang)
+                    if lang and template_is_active(template, lang):
+                        matched = lang
+                        break
+
+            # If all the attempts failed, just use en-US, the default locale of
+            # the site
+            if not matched:
+                matched = settings.LANGUAGE_CODE
+
             response = HttpResponseRedirect('/' + '/'.join([
-                matched or settings.LANGUAGE_CODE,
+                matched,
                 split_path(request.get_full_path())[1]
             ]))
 

lib/l10n_utils/tests/__init__.py

@@ -83,6 +83,12 @@ def test_firefox(self):
             self._test(path, template, 'zu', 'zu,fr;q=0.7,en;q=0.3',
                        302, '/fr/firefox/new/')
 
+            active_mock.reset_mock()
+            active_mock.side_effect = [False, False, False, False, True]
+            # Should fallback to one of the site's fallback languages
+            self._test(path, template, 'es-CL', 'es-CL,es;q=0.7,en;q=0.3',
+                       302, '/es-ES/firefox/new/')
+
 
 class TestGetAcceptLanguages(TestCase):
     def _test(self, accept_lang, list):

lib/l10n_utils/tests/test_files/locale/es-ES/firefox/new.lang

@@ -0,0 +1 @@
+## active ##