diff options
| author | Julien Phalip <jphalip@gmail.com> | 2011-11-11 12:25:53 +0000 |
|---|---|---|
| committer | Julien Phalip <jphalip@gmail.com> | 2011-11-11 12:25:53 +0000 |
| commit | 9d410ee64b1a0f2d8a714eeffa7e17e09965f01c (patch) | |
| tree | fd6a748fe78bd5b11b8ee922b19db5f75829698f | |
| parent | 64fdd844740496519967068998c35109059338b5 (diff) | |
Fixed #17197 -- Prevented a locale leakage from an i18n test causing collateral failures in the rest of the test suite. Thanks to Florian Apolloner for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17080 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | tests/regressiontests/views/tests/i18n.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/regressiontests/views/tests/i18n.py b/tests/regressiontests/views/tests/i18n.py index 2f67d525e1..877cf964dd 100644 --- a/tests/regressiontests/views/tests/i18n.py +++ b/tests/regressiontests/views/tests/i18n.py @@ -6,7 +6,7 @@ from os import path from django.conf import settings from django.test import TestCase -from django.utils.translation import override, activate +from django.utils.translation import override, activate, get_language from django.utils.text import javascript_quote from ..urls import locale_dir @@ -25,6 +25,7 @@ class I18NTests(TestCase): def test_jsi18n(self): """The javascript_catalog can be deployed with language settings""" + saved_lang = get_language() for lang_code in ['es', 'fr', 'ru']: activate(lang_code) catalog = gettext.translation('djangojs', locale_dir, [lang_code]) @@ -37,6 +38,7 @@ class I18NTests(TestCase): if lang_code == 'fr': # Message with context (msgctxt) self.assertContains(response, "['month name\x04May'] = 'mai';", 1) + activate(saved_lang) class JsI18NTests(TestCase): |