Ticket #14825: patch-14825.2.diff

django/middleware/locale.py

@@ -1 +1 @@
 "this is the locale selecting middleware that will look at accept headers"
 
+from django.conf import settings
 from django.utils.cache import patch_vary_headers
 from django.utils import translation
 
@@ -18 +19 @@
         request.LANGUAGE_CODE = translation.get_language()
 
     def process_response(self, request, response):
+        if hasattr(request, 'session'):
+            if not request.session.has_key('django_language'):
+                request.session['django_language'] = translation.get_language()
+        else:
+            # sessions are not used
+            if not response.cookies.has_key(settings.LANGUAGE_COOKIE_NAME):
+                response.set_cookie(settings.LANGUAGE_COOKIE_NAME, translation.get_language())
+
         patch_vary_headers(response, ('Accept-Language',))
         if 'Content-Language' not in response:
             response['Content-Language'] = translation.get_language()