Ticket #17443: cookie_overrides_session_lang_variations.patch

django/utils/translation/trans_real.py

@@ -367 +367 @@
     global _accepted
     from django.conf import settings
     supported = dict(settings.LANGUAGES)
+    lang_code = None
 
     if hasattr(request, 'session'):
         lang_code = request.session.get('django_language', None)
         if lang_code in supported 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 not lang_code:
+        lang_code = request.COOKIES.get(settings.LANGUAGE_COOKIE_NAME)
 
     if lang_code and lang_code not in supported:
         lang_code = lang_code.split('-')[0] # e.g. if fr-ca is not supported fallback to fr