Ticket #5691: cache.patch

django/utils/cache.py

@@ -29 +29 @@
 from django.utils.encoding import smart_str, iri_to_uri
 from django.utils.http import http_date
 from django.utils.hashcompat import md5_constructor
+from django.utils import translation
 
 cc_delim_re = re.compile(r'\s*,\s*')
 
@@ -136 +137 @@
                           if newheader.lower() not in existing_headers]
     response['Vary'] = ', '.join(vary_headers + additional_headers)
 
-def _generate_cache_key(request, headerlist, key_prefix):
+def _generate_cache_key(request, headerlist, key_prefix):    
     """Returns a cache key from the headers given in the header list."""
     ctx = md5_constructor()
     for header in headerlist:
         value = request.META.get(header, None)
         if value is not None:
             ctx.update(value)
-    return 'views.decorators.cache.cache_page.%s.%s.%s' % (
+    cache_key =  'views.decorators.cache.cache_page.%s.%s.%s' % (
                key_prefix, iri_to_uri(request.path), ctx.hexdigest())
 
+    if settings.USE_I18N:
+        cache_key += ".%s" % translation.get_language()
+    return cache_key
+
+
 def get_cache_key(request, key_prefix=None):
     """
     Returns a cache key based on the request path. It can be used in the
@@ -155 +161 @@
 
     If there is no headerlist stored, the page needs to be rebuilt, so this
     function returns None.
-    """
+    """    
     if key_prefix is None:
         key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX
     cache_key = 'views.decorators.cache.cache_header.%s.%s' % (
                     key_prefix, iri_to_uri(request.path))
+    if settings.USE_I18N:
+        cache_key += ".%s" % translation.get_language()
+ 
     headerlist = cache.get(cache_key, None)
     if headerlist is not None:
         return _generate_cache_key(request, headerlist, key_prefix)
@@ -183 +192 @@
         key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX
     if cache_timeout is None:
         cache_timeout = settings.CACHE_MIDDLEWARE_SECONDS
+
     cache_key = 'views.decorators.cache.cache_header.%s.%s' % (
                     key_prefix, iri_to_uri(request.path))
+    if settings.USE_I18N:
+        cache_key += ".%s" % translation.get_language()
     if response.has_header('Vary'):
         headerlist = ['HTTP_'+header.upper().replace('-', '_')
                       for header in cc_delim_re.split(response['Vary'])]