paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 20:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

i18n: Use language code instead of locale.

Browse Source 
We have been assigning locale to language code. Mostly code and locale
are same but for languages like zh-Hans, locale is zh_Hans and code is
zh-hans.

After this commit, compilemessages command should be run.
This commit is contained in:
Umair Khan
2017-10-20 11:16:18 +05:00
committed by Tim Abbott
parent df13ac570a
commit 2db1cba9cc
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend_tests/casper_tests/06-settings.js
View File

@@ -263,10 +263,10 @@ casper.thenClick('#default_language');
casper.waitUntilVisible('#default_language_modal'); casper.waitUntilVisible('#default_language_modal');
casper.thenClick('a[data-code="zh_Hans"]'); casper.thenClick('a[data-code="zh-hans"]');
casper.waitUntilVisible('#display-settings-status', function () { casper.waitUntilVisible('#display-settings-status', function () {
casper.test.assertSelectorHasText('#display-settings-status', 'Chinese Simplified is now the default language'); casper.test.assertSelectorHasText('#display-settings-status', '简体中文 is now the default language');
casper.test.info("Reloading the page."); casper.test.info("Reloading the page.");
casper.reload(); casper.reload();
}); });
@@ -276,7 +276,7 @@ casper.then(function () {
casper.test.info("Checking if we are on Chinese page."); casper.test.info("Checking if we are on Chinese page.");
casper.test.assertEvalEquals(function () { casper.test.assertEvalEquals(function () {
return $('#default_language_name').text().trim(); return $('#default_language_name').text().trim();
}, 'Chinese Simplified'); }, '简体中文');
casper.test.info("Opening German page through i18n url."); casper.test.info("Opening German page through i18n url.");
}); });
}); });

2
version.py
View File

@@ -1,2 +1,2 @@
ZULIP_VERSION = "1.6.0+git" ZULIP_VERSION = "1.6.0+git"
PROVISION_VERSION = '10.5' PROVISION_VERSION = '10.6'

8
zerver/lib/i18n.py
View File

@@ -55,11 +55,15 @@ def get_language_list_for_templates(default_language):
if 'percent_translated' in lang: if 'percent_translated' in lang:
percent = u"{} ({}%)".format(name, lang['percent_translated']) percent = u"{} ({}%)".format(name, lang['percent_translated'])
selected = False
if default_language in (lang['code'], lang['locale']):
selected = True
item[position] = { item[position] = {
'name': name, 'name': name,
'code': lang['code'], 'code': lang['code'],
'percent': percent, 'percent': percent,
'selected': True if default_language == lang['code'] else False 'selected': selected
} }
formatted_list.append(item) formatted_list.append(item)
@@ -69,7 +73,7 @@ def get_language_list_for_templates(default_language):
def get_language_name(code): def get_language_name(code):
# type: (str) -> Optional[Text] # type: (str) -> Optional[Text]
for lang in get_language_list(): for lang in get_language_list():
if lang['code'] == code: if code in (lang['code'], lang['locale']):
return lang['name'] return lang['name']
return None return None

4
zerver/management/commands/compilemessages.py
View File

@@ -89,6 +89,7 @@ class Command(compilemessages.Command):
'name': 'English', 'name': 'English',
'name_local': 'English', 'name_local': 'English',
'code': 'en', 'code': 'en',
'locale': 'en',
}) })
continue continue
@@ -111,7 +112,8 @@ class Command(compilemessages.Command):
info['name'] = name info['name'] = name
info['name_local'] = name_local info['name_local'] = name_local
info['code'] = locale info['code'] = code
info['locale'] = locale
info['percent_translated'] = percentage info['percent_translated'] = percentage
data['languages'].append(info) data['languages'].append(info)