Ticket #5603: language_cookie_name.diff

django/utils/translation/trans_real.py

@@ -338 +338 @@
         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('django_language', None)
+    lang_code = request.COOKIES.get( settings.LANGUAGE_COOKIE_NAME, None)
     if lang_code in supported and lang_code is not None and check_for_language(lang_code):
         return lang_code
 

django/views/i18n.py

@@ -22 +22 @@
         if hasattr(request, 'session'):
             request.session['django_language'] = lang_code
         else:
-            response.set_cookie('django_language', lang_code)
+            response.set_cookie(settings.LANGUAGE_COOKIE_NAME, lang_code)
     return response
 
 NullSource = """

django/conf/global_settings.py

@@ -90 +90 @@
 # to load the internationalization machinery.
 USE_I18N = True
 
+#
+# Make sure that this is different to to all
+# other cookie names (e.g. SESSION_COOKIE_NAME)
+#
+LANGUAGE_COOKIE_NAME = 'django_language'
+
 # Not-necessarily-technical managers of the site. They get broken link
 # notifications and other various e-mails.
 MANAGERS = ADMINS