Ticket #3594: javascript_translation_r8521.patch

django/views/i18n.py

@@ -137 +137 @@
         except IOError:
             # 'en' catalog was missing. This is harmless.
             pass
-    # next load the settings.LANGUAGE_CODE translations if it isn't english
-    if default_locale != 'en':
+    # next load the currently selected language, if it isn't english
+    if locale != 'en':
         for path in paths:
             try:
-                catalog = gettext_module.translation(domain, path, [default_locale])
-            except IOError:
-                catalog = None
-            if catalog is not None:
-                t.update(catalog._catalog)
-    # last load the currently selected language, if it isn't identical to the default.
-    if locale != default_locale:
-        for path in paths:
-            try:
                 catalog = gettext_module.translation(domain, path, [locale])
             except IOError:
                 catalog = None