openstack
/
deb-python-oslo.i18n
Code Issues Proposed changes

Merge "Fix wrong response with language zh-TW."

This commit is contained in:
Jenkins 2017-03-08 06:21:26 +00:00 committed by Gerrit Code Review
parent c103d6f682 108d2bb7a9
commit 0ff3ab0590
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
oslo_i18n/_gettextutils.py
View File

@ -80,10 +80,22 @@ def get_available_languages(domain):
'zh_Hant_HK': 'zh_HK',
'zh_Hant': 'zh_TW',
'fil': 'tl_PH'}
language_list.extend(alias for locale, alias in aliases.items()
if (locale in language_list and
alias not in language_list))
_AVAILABLE_LANGUAGES[domain] = language_list
return copy.copy(language_list)
language_list.extend(alias for locale, alias in aliases.items()
if (locale not in language_list and
find(alias)))
# In webob.acceptparse, the best_match is just match the first element in
# the language_list, so make the precise element in front
result = ['en_US']
for i in language_list[1:]:
if '_' in i:
result.insert(1, i)
else:
result.append(i)
_AVAILABLE_LANGUAGES[domain] = result
return copy.copy(result)