mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

Merge pull request #791 from khalas/ticket_19811 

Changed %r to %s in get_language_info error message
This commit is contained in:
Honza Král 2013-02-23 10:16:23 -08:00
parent f368c25f10 48dc0cbf2a
commit 0a341ab40d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/utils/translation/__init__.py
View File

@ -192,5 +192,5 @@ def get_language_info(lang_code):
try:
return LANG_INFO[splited_lang_code]
except KeyError:
raise KeyError("Unknown language code %r and %r." % (lang_code, splited_lang_code))
raise KeyError("Unknown language code %r." % lang_code)
raise KeyError("Unknown language code %s and %s." % (lang_code, splited_lang_code))
raise KeyError("Unknown language code %s." % lang_code)

4
tests/regressiontests/i18n/tests.py
View File

@ -957,7 +957,7 @@ class TestLanguageInfo(TestCase):
self.assertEqual(li['bidi'], False)
def test_unknown_language_code(self):
with self.assertRaisesRegexp(KeyError, "Unknown language code u\'xx\'."):
with self.assertRaisesRegexp(KeyError, "Unknown language code xx."):
get_language_info('xx')
def test_unknown_only_country_code(self):
@ -968,7 +968,7 @@ class TestLanguageInfo(TestCase):
self.assertEqual(li['bidi'], False)
def test_unknown_language_code_and_country_code(self):
with self.assertRaisesRegexp(KeyError, "Unknown language code u\'xx-xx\' and u\'xx\'."):
with self.assertRaisesRegexp(KeyError, "Unknown language code xx-xx and xx."):
get_language_info('xx-xx')