Ticket #6376: gettext_domain.patch

django/conf/global_settings.py

@@ -89 +89 @@
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
-
 LOCALE_PATHS = ()
+GETTEXT_DOMAIN = None
 
 # Not-necessarily-technical managers of the site. They get broken link
 # notifications and other various e-mails.

django/utils/translation/trans_real.py

@@ -149 +149 @@
         if res is not None:
             return res
 
-        def _translation(path):
+        def _translation(path, domain='django'):
             try:
-                t = gettext_module.translation('django', path, [loc], klass)
+                t = gettext_module.translation(domain, path, [loc], klass)
                 t.set_language(lang)
                 return t
             except IOError, e:
@@ -163 +163 @@
             t = _translation(path)
             if t is not None:
                 if res is None:
-                    return t
+                    res = t
                 else:
                     res.merge(t)
+            if settings.GETTEXT_DOMAIN:
+                t = _translation(path, settings.GETTEXT_DOMAIN)
+                if t is not None:
+                    if res is None:
+                        res = t
+                    else:
+                        res.merge(t)
             return res
 
         for localepath in settings.LOCALE_PATHS: