Ticket #5241: locale.diff

django/middleware/locale.py

@@ -2 +2 @@
 
 from django.utils.cache import patch_vary_headers
 from django.utils import translation
+import new
 
 class LocaleMiddleware(object):
     """
@@ -20 +21 @@
     def process_response(self, request, response):
         patch_vary_headers(response, ('Accept-Language',))
         response['Content-Language'] = translation.get_language()
-        translation.deactivate()
+        # deactivate translation on close (last step in request
+        # handling) in order to translate iterator based responses.
+        def locale_middleware_close(self):
+            self.locale_middleware_original_close()
+            translation.deactivate()
+        response.locale_middleware_original_close = response.close
+        response.close = new.instancemethod(locale_middleware_close,
+                                            response, response.__class__)
         return response