Ticket #5789: 5789.patch

django/utils/translation/trans_real.py

@@ -350 +350 @@
     supported = dict(settings.LANGUAGES)
 
     if hasattr(request, 'session'):
-        lang_code = request.session.get('django_language', None)
+        lang_code = request.session.get('_language', 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

@@ -1 +1 @@
 from django import http
-from django.utils.translation import check_for_language, activate, to_locale, get_language
+from django.utils.translation import check_for_language, activate, to_locale
+from django.utils.translation import get_language
 from django.utils.text import javascript_quote
 from django.conf import settings
 import os
@@ -26 +27 @@
         lang_code = request.POST.get('language', None)
         if lang_code and check_for_language(lang_code):
             if hasattr(request, 'session'):
-                request.session['django_language'] = lang_code
+                request.session['_language'] = lang_code
             else:
                 response.set_cookie(settings.LANGUAGE_COOKIE_NAME, lang_code)
     return response

docs/i18n.txt

@@ -545 +545 @@
 ``LocaleMiddleware`` tries to determine the user's language preference by
 following this algorithm:
 
-    * First, it looks for a ``django_language`` key in the the current user's
+    * First, it looks for a ``_language`` key in the the current user's
       `session`_.
-    * Failing that, it looks for a cookie that is named according to your ``LANGUAGE_COOKIE_NAME`` setting. (The default name is ``django_language``, and this setting is new in the Django development version. In Django version 0.96 and before, the cookie's name is hard-coded to ``django_language``.)
+    * Failing that, it looks for a cookie that is named according to your ``LANGUAGE_COOKIE_NAME`` setting. (The default name is ``django_language``, and this setting is new in the Django development version. In Django version 0.96 and earlier, the cookie's name is hard-coded to ``django_language``.)
     * Failing that, it looks at the ``Accept-Language`` HTTP header. This
       header is sent by your browser and tells the server which language(s) you
       prefer, in order by priority. Django tries each language in the header
@@ -859 +859 @@
     * Django doesn't use ``xgettext`` alone. It uses Python wrappers around
       ``xgettext`` and ``msgfmt``. This is mostly for convenience.
 
+

tests/regressiontests/views/tests/i18n.py

@@ -16 +16 @@
             post_data = dict(language=lang_code, next='/views/')
             response = self.client.post('/views/i18n/setlang/', data=post_data)
             self.assertRedirects(response, 'http://testserver/views/')
-            self.assertEquals(self.client.session['django_language'], lang_code)
+            self.assertEquals(self.client.session['_language'], lang_code)
 
     def test_jsi18n(self):
         """The javascript_catalog can be deployed with language settings"""