Commit 6d1ae5e2 authored by Tim Graham's avatar Tim Graham
Browse files

Removed reading of old 'django_language' session variable per deprecation timeline. 

refs #5789.
parent f567d04b

django/contrib/auth/__init__.py

+1 −2
Original line number Diff line number Diff line
@@ -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()

django/utils/translation/trans_real.py

+1 −2
Original line number Diff line number Diff line
@@ -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