summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorVlastimil Zíma <vlastimil.zima@nic.cz>2013-03-25 15:45:24 +0100
committerClaude Paroz <claude@2xlibre.net>2013-05-25 10:52:54 +0200
commit6de81d65f443a01961c23139ca5d7653ef012d35 (patch)
treee94701b3d8e4ebb55319fb323431627c3f24a984 /django
parent1514f17aa60772f48839130f9a5071b9ffe15213 (diff)
Fixed #14825 -- LocaleMiddleware keeps language
* LocaleMiddleware stores language into session if it is not present there.
Diffstat (limited to 'django')
-rw-r--r--django/middleware/locale.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/django/middleware/locale.py b/django/middleware/locale.py
index 25fbbaccdd..2e2204c859 100644
--- a/django/middleware/locale.py
+++ b/django/middleware/locale.py
@@ -53,6 +53,10 @@ class LocaleMiddleware(object):
request.get_host(), language, request.get_full_path())
return HttpResponseRedirect(language_url)
+ # Store language back into session if it is not present
+ if hasattr(request, 'session'):
+ request.session.setdefault('django_language', language)
+
if not (self.is_language_prefix_patterns_used()
and language_from_path):
patch_vary_headers(response, ('Accept-Language',))