Ticket #11118: basecommand.diff

django/core/management/base.py

@@ -207 +207 @@
         # like permissions, and those shouldn't contain any translations.
         # But only do this if we can assume we have a working settings file,
         # because django.utils.translation requires settings.
+        lang = None
         if self.can_import_settings:
             try:
                 from django.utils import translation
+                lang = translation.get_language()
                 translation.activate('en-us')
             except ImportError, e:
                 # If settings should be available, but aren't,
@@ -232 +234 @@
         except CommandError, e:
             sys.stderr.write(self.style.ERROR(str('Error: %s\n' % e)))
             sys.exit(1)
+        if lang is not None:
+            # rolls back the temporary 'en-us' language to the one it
+            # was set to before (useful when called programmaticaly, e.g.
+            # in testing where the original language should be kept.
+            try:
+                from django.utils import translation
+                translation.activate(lang)
+            except ImportError, e:
+                # Should never happen (TM) since it worked above (lang != None)
+                sys.stderr.write(self.style.ERROR(str('Error: %s\n' % e)))
+                sys.exit(1)
 
     def validate(self, app=None, display_num_errors=False):
         """