summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorHonza Král <Honza.Kral@gmail.com>2013-02-23 08:30:27 -0800
committerHonza Král <Honza.Kral@gmail.com>2013-02-23 08:30:27 -0800
commit0ad76843b5032af52022adff7b676db633ce8b7e (patch)
tree32ff18123f3405fa1fa1cf4963ab8e8aa79b49a8 /django
parentf3ae67a62f5bdcee892f19667967e8738f734908 (diff)
parent6bd6a568960e9ddebd78da8e008b235b3b76c5a2 (diff)
Merge pull request #777 from khalas/ticket_19811
Fixed #19811 - Added language code fallback in get_language_info
Diffstat (limited to 'django')
-rw-r--r--django/utils/translation/__init__.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py
index 6fd52b6023..4645f142ce 100644
--- a/django/utils/translation/__init__.py
+++ b/django/utils/translation/__init__.py
@@ -187,4 +187,10 @@ def get_language_info(lang_code):
try:
return LANG_INFO[lang_code]
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)