summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2011-11-01 14:02:31 +0000
committerAymeric Augustin <aymeric.augustin@m4x.org>2011-11-01 14:02:31 +0000
commitaf1893c4ff8fdbf227a43a559d90bb1c1238b01a (patch)
treec5d9709e7089197b3b10471232ee85a1547d7953 /django
parent01964fd7e4ecd1998a2288e1759a63bd9a5fb2df (diff)
Made the cache locale-dependant when USE_L10N is True, even if USE_I18N is False. Refs #5691.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/utils/cache.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/cache.py b/django/utils/cache.py
index 71c091ee18..be4fa58645 100644
--- a/django/utils/cache.py
+++ b/django/utils/cache.py
@@ -158,7 +158,7 @@ def has_vary_header(response, header_query):
def _i18n_cache_key_suffix(request, cache_key):
"""If enabled, returns the cache key ending with a locale."""
- if settings.USE_I18N:
+ if settings.USE_I18N or settings.USE_L10N:
# first check if LocaleMiddleware or another middleware added
# LANGUAGE_CODE to request, then fall back to the active language
# which in turn can also fall back to settings.LANGUAGE_CODE