Fixed #24073 -- Returned None for get_language when translations are deactivated

This fixes a regression caused by f7c287fca9. Thanks Markus Holtermann
for identifying the regression.

2 files changed, 5 insertions, 7 deletions

diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py
index 9e271b3fa6..a0df8daddf 100644
--- a/tests/i18n/tests.py
+++ b/tests/i18n/tests.py
@@ -68,7 +68,7 @@ class TranslationTests(TestCase):
                 self.assertEqual(get_language(), 'pl')
             self.assertEqual(get_language(), 'de')
             with translation.override(None):
-                self.assertEqual(get_language(), settings.LANGUAGE_CODE)
+                self.assertEqual(get_language(), None)
             self.assertEqual(get_language(), 'de')
         finally:
             deactivate()
@@ -81,7 +81,7 @@ class TranslationTests(TestCase):
 
         @translation.override(None)
         def func_none():
-            self.assertEqual(get_language(), settings.LANGUAGE_CODE)
+            self.assertEqual(get_language(), None)
 
         try:
             activate('de')
diff --git a/tests/user_commands/tests.py b/tests/user_commands/tests.py
index c364b868a3..40ffca95cb 100644
--- a/tests/user_commands/tests.py
+++ b/tests/user_commands/tests.py
@@ -2,7 +2,6 @@ import os
 
 from django.apps import apps
 from django.db import connection
-from django.conf import settings
 from django.core import management
 from django.core.management import BaseCommand, CommandError, find_commands
 from django.core.management.utils import find_command, popen_wrapper
@@ -48,13 +47,12 @@ class CommandTests(SimpleTestCase):
             management.ManagementUtility(['manage.py', 'dance', '--example=raise']).execute()
         self.assertIn("CommandError", stderr.getvalue())
 
-    def test_default_en_us_locale_set(self):
-        # Forces en_us when set to true
+    def test_deactivate_locale_set(self):
+        # Deactivate translation when set to true
         out = StringIO()
         with translation.override('pl'):
             management.call_command('leave_locale_alone_false', stdout=out)
-            # get_language returns settings.LANGUAGE_CODE for NullTranslations instances
-            self.assertEqual(out.getvalue(), "%s\n" % settings.LANGUAGE_CODE)
+            self.assertEqual(out.getvalue(), "")
 
     def test_configured_locale_preserved(self):
         # Leaves locale from settings when set to false