Ticket #17379: 17379-1.diff

django/core/management/base.py

@@ -137 +137 @@
 
     # Configuration shortcuts that alter various logic.
     can_import_settings = True
+    keep_active_language = False
     requires_model_validation = True
     output_transaction = False  # Whether to wrap the output in a "BEGIN; COMMIT;"
 
@@ -210 +211 @@
         # But only do this if we can assume we have a working settings file,
         # because django.utils.translation requires settings.
         saved_lang = None
-        if self.can_import_settings:
+        if self.can_import_settings and not self.keep_active_language:
             try:
                 from django.utils import translation
                 saved_lang = translation.get_language()
                 translation.activate('en-us')
+                verbosity = int(options.get('verbosity'))
+                if verbosity >= 2:
+                    sys.stderr.write("Setting active language to 'en-us'\n")
             except ImportError, e:
                 # If settings should be available, but aren't,
                 # raise the error and quit.

django/core/management/commands/shell.py

@@ -9 +9 @@
     )
     help = "Runs a Python interactive interpreter. Tries to use IPython, if it's available."
     shells = ['ipython', 'bpython']
+    keep_active_language = True
     requires_model_validation = False
 
     def ipython(self):