Partial revert of 165f44aa.

That commit didn't always improve readability.

See discussion on django-developers for details.

1 files changed, 17 insertions, 19 deletions

diff --git a/tests/view_tests/tests/test_i18n.py b/tests/view_tests/tests/test_i18n.py
index 50677947b6..680cd25d6a 100644
--- a/tests/view_tests/tests/test_i18n.py
+++ b/tests/view_tests/tests/test_i18n.py
@@ -116,10 +116,10 @@ class JsI18NTests(TestCase):
         with the proper English translations. See #13726 for more details.
         """
         extended_apps = list(settings.INSTALLED_APPS) + ['view_tests.app0']
-        with self.settings(LANGUAGE_CODE='fr', INSTALLED_APPS=extended_apps), \
-                override('en-us'):
-            response = self.client.get('/views/jsi18n_english_translation/')
-            self.assertContains(response, javascript_quote('this app0 string is to be translated'))
+        with self.settings(LANGUAGE_CODE='fr', INSTALLED_APPS=extended_apps):
+            with override('en-us'):
+                response = self.client.get('/views/jsi18n_english_translation/')
+                self.assertContains(response, javascript_quote('this app0 string is to be translated'))
 
     def testI18NLanguageNonEnglishFallback(self):
         """
@@ -145,11 +145,10 @@ class JsI18NTestsMultiPackage(TestCase):
         #3594 and #13514 for more details.
         """
         extended_apps = list(settings.INSTALLED_APPS) + ['view_tests.app1', 'view_tests.app2']
-        with self.settings(LANGUAGE_CODE='en-us', INSTALLED_APPS=extended_apps), \
-                override('fr'):
-            response = self.client.get('/views/jsi18n_multi_packages1/')
-            self.assertContains(response,
-                javascript_quote('il faut traduire cette chaîne de caractères de app1'))
+        with self.settings(LANGUAGE_CODE='en-us', INSTALLED_APPS=extended_apps):
+            with override('fr'):
+                response = self.client.get('/views/jsi18n_multi_packages1/')
+                self.assertContains(response, javascript_quote('il faut traduire cette chaîne de caractères de app1'))
 
     def testI18NDifferentNonEnLangs(self):
         """
@@ -157,21 +156,20 @@ class JsI18NTestsMultiPackage(TestCase):
         English.
         """
         extended_apps = list(settings.INSTALLED_APPS) + ['view_tests.app3', 'view_tests.app4']
-        with self.settings(LANGUAGE_CODE='fr', INSTALLED_APPS=extended_apps), \
-                override('es-ar'):
-            response = self.client.get('/views/jsi18n_multi_packages2/')
-            self.assertContains(response,
-                javascript_quote('este texto de app3 debe ser traducido'))
+        with self.settings(LANGUAGE_CODE='fr', INSTALLED_APPS=extended_apps):
+            with override('es-ar'):
+                response = self.client.get('/views/jsi18n_multi_packages2/')
+                self.assertContains(response, javascript_quote('este texto de app3 debe ser traducido'))
 
     def testI18NWithLocalePaths(self):
         extended_locale_paths = settings.LOCALE_PATHS + (
             path.join(path.dirname(
                 path.dirname(path.abspath(upath(__file__)))), 'app3', 'locale'),)
-        with self.settings(LANGUAGE_CODE='es-ar', LOCALE_PATHS=extended_locale_paths), \
-                override('es-ar'):
-            response = self.client.get('/views/jsi18n/')
-            self.assertContains(response,
-                javascript_quote('este texto de app3 debe ser traducido'))
+        with self.settings(LANGUAGE_CODE='es-ar', LOCALE_PATHS=extended_locale_paths):
+            with override('es-ar'):
+                response = self.client.get('/views/jsi18n/')
+                self.assertContains(response,
+                    javascript_quote('este texto de app3 debe ser traducido'))
 
 
 skip_selenium = not os.environ.get('DJANGO_SELENIUM_TESTS', False)