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

Merge pull request #777 from khalas/ticket_19811 

Fixed #19811 - Added language code fallback in get_language_info
This commit is contained in:
Honza Král 2013-02-23 08:30:27 -08:00
parent f3ae67a62f 6bd6a56896
commit 0ad76843b5
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,4 +187,10 @@ def get_language_info(lang_code):
try: try:
return LANG_INFO[lang_code] return LANG_INFO[lang_code]
except KeyError: except KeyError:
if '-' in lang_code:
splited_lang_code = lang_code.split('-')[0]
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 %r." % lang_code)

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

@ -956,6 +956,21 @@ class TestLanguageInfo(TestCase):
self.assertEqual(li['name'], 'German') self.assertEqual(li['name'], 'German')
self.assertEqual(li['bidi'], False) self.assertEqual(li['bidi'], False)
def test_unknown_language_code(self):
with self.assertRaisesRegexp(KeyError, "Unknown language code u\'xx\'."):
get_language_info('xx')
def test_unknown_only_country_code(self):
li = get_language_info('de-xx')
self.assertEqual(li['code'], 'de')
self.assertEqual(li['name_local'], 'Deutsch')
self.assertEqual(li['name'], 'German')
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\'."):
get_language_info('xx-xx')
class MultipleLocaleActivationTests(TestCase): class MultipleLocaleActivationTests(TestCase):
""" """