From 7a0d9b5cda04c74287e052f1b4ebdf869e53ff0f Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Fri, 3 Apr 2015 12:11:54 +0200 Subject: Fixed #24569 -- Made some translation functions accept None value get_language() can return None when translations are deactivated. Thanks Nicola Peduzzi for the reporti and Tim Graham for the review. --- tests/i18n/tests.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py index 34681790c0..69f6dbbe2e 100644 --- a/tests/i18n/tests.py +++ b/tests/i18n/tests.py @@ -27,10 +27,10 @@ from django.utils.safestring import SafeBytes, SafeString, SafeText, mark_safe from django.utils.six import PY3 from django.utils.translation import ( LANGUAGE_SESSION_KEY, activate, check_for_language, deactivate, - get_language, get_language_from_request, get_language_info, gettext, - gettext_lazy, ngettext_lazy, npgettext, npgettext_lazy, pgettext, - pgettext_lazy, string_concat, to_locale, trans_real, ugettext, - ugettext_lazy, ungettext, ungettext_lazy, + get_language, get_language_bidi, get_language_from_request, + get_language_info, gettext, gettext_lazy, ngettext_lazy, npgettext, + npgettext_lazy, pgettext, pgettext_lazy, string_concat, to_locale, + trans_real, ugettext, ugettext_lazy, ungettext, ungettext_lazy, ) from .forms import CompanyForm, I18nForm, SelectDateForm @@ -398,6 +398,11 @@ class TranslationTests(TestCase): self.assertEqual(trans_real.to_language('en_US'), 'en-us') self.assertEqual(trans_real.to_language('sr_Lat'), 'sr-lat') + def test_language_bidi(self): + self.assertEqual(get_language_bidi(), False) + with translation.override(None): + self.assertEqual(get_language_bidi(), False) + @override_settings(LOCALE_PATHS=[os.path.join(here, 'other', 'locale')]) def test_bad_placeholder_1(self): """ @@ -1417,6 +1422,7 @@ class CountrySpecificLanguageTests(TestCase): self.assertTrue(check_for_language('en-US')) self.assertFalse(check_for_language('en-ΓΌ')) self.assertFalse(check_for_language('en\x00')) + self.assertFalse(check_for_language(None)) def test_get_language_from_request(self): # issue 19919 -- cgit v1.3