diff options
| author | Tim Graham <timograham@gmail.com> | 2014-03-21 09:53:16 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-03-21 09:53:16 -0400 |
| commit | 6d1ae5e27c3fe612209023bacd8a201fffedc375 (patch) | |
| tree | e27a4e4ce34ab6c1307df2325ec837e6463db40e | |
| parent | f567d04b249913db4a37adab8ba521cdc974d423 (diff) | |
Removed reading of old 'django_language' session variable per deprecation timeline.
refs #5789.
| -rw-r--r-- | django/contrib/auth/__init__.py | 3 | ||||
| -rw-r--r-- | django/utils/translation/trans_real.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/django/contrib/auth/__init__.py b/django/contrib/auth/__init__.py index 1ae323e902..7b44fe2351 100644 --- a/django/contrib/auth/__init__.py +++ b/django/contrib/auth/__init__.py @@ -108,8 +108,7 @@ def logout(request): user_logged_out.send(sender=user.__class__, request=request, user=user) # remember language choice saved to session - # for backwards compatibility django_language is also checked (remove in 1.8) - language = request.session.get(LANGUAGE_SESSION_KEY, request.session.get('django_language')) + language = request.session.get(LANGUAGE_SESSION_KEY) request.session.flush() diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index bf6ad7ee95..939e0f540f 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -479,8 +479,7 @@ def get_language_from_request(request, check_path=False): return lang_code if hasattr(request, 'session'): - # for backwards compatibility django_language is also checked (remove in 1.8) - lang_code = request.session.get(LANGUAGE_SESSION_KEY, request.session.get('django_language')) + lang_code = request.session.get(LANGUAGE_SESSION_KEY) if lang_code in _supported and lang_code is not None and check_for_language(lang_code): return lang_code |