Ticket #5494: root-locale-js-catalog.diff

django/views/i18n.py

@@ -110 +110 @@
         packages = ['django.conf']
     if type(packages) in (str, unicode):
         packages = packages.split('+')
-    packages = [p for p in packages if p == 'django.conf' or p in settings.INSTALLED_APPS]
+    packages = [p for p in packages if p == 'django.conf' or p == '' or p in settings.INSTALLED_APPS]
     default_locale = to_locale(settings.LANGUAGE_CODE)
     locale = to_locale(get_language())
     t = {}
     paths = []
     # first load all english languages files for defaults
     for package in packages:
-        p = __import__(package, {}, {}, [''])
-        path = os.path.join(os.path.dirname(p.__file__), 'locale')
+        if p == '':
+            path = 'locale'
+        else:
+            p = __import__(package, {}, {}, [''])
+            path = os.path.join(os.path.dirname(p.__file__), 'locale')
         paths.append(path)
         try:
             catalog = gettext_module.translation(domain, path, ['en'])