summaryrefslogtreecommitdiff
path: root/django/utils/translation/trans_real.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2016-08-14 22:42:49 +0200
committerTim Graham <timograham@gmail.com>2019-02-14 10:23:02 -0500
commita8e2a9bac6e548d6ab2e13af6171d2fdd3b8055b (patch)
treef49b5f5f14b5a8d8f907efee6079a4e3b51ce72c /django/utils/translation/trans_real.py
parent76990cbbda5d93fda560c8a5ab019860f7efaab7 (diff)
Refs #15902 -- Deprecated storing user's language in the session.
Diffstat (limited to 'django/utils/translation/trans_real.py')
-rw-r--r--django/utils/translation/trans_real.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
index d6f1f7f14f..f4985fb3c1 100644
--- a/django/utils/translation/trans_real.py
+++ b/django/utils/translation/trans_real.py
@@ -15,7 +15,7 @@ from django.core.signals import setting_changed
from django.dispatch import receiver
from django.utils.safestring import SafeData, mark_safe
-from . import LANGUAGE_SESSION_KEY, to_language, to_locale
+from . import to_language, to_locale
# Translations are cached in a dictionary for every language.
# The active translations are stored by threadid to make them thread local.
@@ -456,14 +456,9 @@ def get_language_from_request(request, check_path=False):
if lang_code is not None:
return lang_code
- supported_lang_codes = get_languages()
-
- if hasattr(request, 'session'):
- lang_code = request.session.get(LANGUAGE_SESSION_KEY)
- if lang_code in supported_lang_codes and lang_code is not None and check_for_language(lang_code):
- return lang_code
-
lang_code = request.COOKIES.get(settings.LANGUAGE_COOKIE_NAME)
+ if lang_code is not None and lang_code in get_languages() and check_for_language(lang_code):
+ return lang_code
try:
return get_supported_language_variant(lang_code)