Fixed #22120 -- Documented persistent activation of languages and cleaned up language session key use

2 files changed, 5 insertions, 5 deletions

diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py
index c7179d6117..56c3f63316 100644
--- a/tests/i18n/tests.py
+++ b/tests/i18n/tests.py
@@ -31,7 +31,7 @@ from django.utils.translation import (activate, deactivate,
     pgettext,
     npgettext, npgettext_lazy,
     check_for_language,
-    string_concat)
+    string_concat, LANGUAGE_SESSION_KEY)
 
 from .forms import I18nForm, SelectDateForm, SelectDateWidget, CompanyForm
 from .models import Company, TestModel
@@ -1267,7 +1267,7 @@ class LocaleMiddlewareTests(TestCase):
         session on every request."""
         # Regression test for #21473
         self.client.get('/fr/simple/')
-        self.assertNotIn('_language', self.client.session)
+        self.assertNotIn(LANGUAGE_SESSION_KEY, self.client.session)
 
 
 @override_settings(
diff --git a/tests/view_tests/tests/test_i18n.py b/tests/view_tests/tests/test_i18n.py
index 72da88e92c..7d6466d44f 100644
--- a/tests/view_tests/tests/test_i18n.py
+++ b/tests/view_tests/tests/test_i18n.py
@@ -11,7 +11,7 @@ from django.test import (
     LiveServerTestCase, TestCase, modify_settings, override_settings)
 from django.utils import six
 from django.utils._os import upath
-from django.utils.translation import override
+from django.utils.translation import override, LANGUAGE_SESSION_KEY
 
 try:
     from selenium.webdriver.firefox import webdriver as firefox
@@ -35,7 +35,7 @@ class I18NTests(TestCase):
             post_data = dict(language=lang_code, next='/')
             response = self.client.post('/i18n/setlang/', data=post_data)
             self.assertRedirects(response, 'http://testserver/')
-            self.assertEqual(self.client.session['_language'], lang_code)
+            self.assertEqual(self.client.session[LANGUAGE_SESSION_KEY], lang_code)
 
     def test_setlang_unsafe_next(self):
         """
@@ -46,7 +46,7 @@ class I18NTests(TestCase):
         post_data = dict(language=lang_code, next='//unsafe/redirection/')
         response = self.client.post('/i18n/setlang/', data=post_data)
         self.assertEqual(response.url, 'http://testserver/')
-        self.assertEqual(self.client.session['_language'], lang_code)
+        self.assertEqual(self.client.session[LANGUAGE_SESSION_KEY], lang_code)
 
     def test_setlang_reversal(self):
         self.assertEqual(reverse('set_language'), '/i18n/setlang/')