From aa089b106b6cfc9a47cd54a0f9eb44bd44811ed9 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Thu, 28 Feb 2013 13:45:21 +0100
Subject: [PATCH] Fixed #5241 -- Kept active transalation in
 LocaleMiddleware.process_response.

---
 django/middleware/locale.py |  2 +-
 tests/i18n/tests.py         | 23 +++++++++++++++++++++++
 tests/i18n/urls.py          |  9 +++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 tests/i18n/urls.py

diff --git a/django/middleware/locale.py b/django/middleware/locale.py
index be0e549495..9b2ef8ff32 100644
--- a/django/middleware/locale.py
+++ b/django/middleware/locale.py
@@ -51,7 +51,7 @@ class LocaleMiddleware(object):
                     request.is_secure() and 'https' or 'http',
                     request.get_host(), language, request.get_full_path())
                 return HttpResponseRedirect(language_url)
-        translation.deactivate()
+
         if not (self.is_language_prefix_patterns_used()
                 and language_from_path):
             patch_vary_headers(response, ('Accept-Language',))
diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py
index 4d06c85c97..3038c4813c 100644
--- a/tests/i18n/tests.py
+++ b/tests/i18n/tests.py
@@ -1096,3 +1096,26 @@ class MultipleLocaleActivationTests(TestCase):
             t = Template("{% load i18n %}{% blocktrans %}No{% endblocktrans %}")
         with translation.override('nl'):
             self.assertEqual(t.render(Context({})), 'Nee')
+
+
+@override_settings(
+    USE_I18N=True,
+    LANGUAGES=(
+        ('en', 'English'),
+        ('fr', 'French'),
+    ),
+    MIDDLEWARE_CLASSES=(
+        'django.middleware.locale.LocaleMiddleware',
+        'django.middleware.common.CommonMiddleware',
+    ),
+)
+class LocaleMiddlewareTests(TestCase):
+
+    urls = 'i18n.urls'
+
+    def test_streaming_response(self):
+        # Regression test for #5241
+        response = self.client.get('/fr/streaming/')
+        self.assertContains(response, "Oui/Non")
+        response = self.client.get('/en/streaming/')
+        self.assertContains(response, "Yes/No")
diff --git a/tests/i18n/urls.py b/tests/i18n/urls.py
new file mode 100644
index 0000000000..c118265dab
--- /dev/null
+++ b/tests/i18n/urls.py
@@ -0,0 +1,9 @@
+from __future__ import unicode_literals
+
+from django.conf.urls.i18n import i18n_patterns
+from django.http import StreamingHttpResponse
+from django.utils.translation import ugettext_lazy as _
+
+urlpatterns = i18n_patterns('',
+    (r'^streaming/$', lambda r: StreamingHttpResponse([_("Yes"), "/", _("No")])),
+)