From 6d7839007a924bf3972529624e41c14b2ce61926 Mon Sep 17 00:00:00 2001 From: louyihua Date: Thu, 12 Jun 2014 01:19:49 +0800 Subject: [PATCH] Do not merge zh-hk into zh-tw in darklang --- common/djangoapps/dark_lang/middleware.py | 3 +-- common/djangoapps/dark_lang/tests.py | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common/djangoapps/dark_lang/middleware.py b/common/djangoapps/dark_lang/middleware.py index f6b72426f8..96e06947a6 100644 --- a/common/djangoapps/dark_lang/middleware.py +++ b/common/djangoapps/dark_lang/middleware.py @@ -44,11 +44,10 @@ CHINESE_LANGUAGE_CODE_MAP = { 'zh-hans-cn': 'zh-CN', # Chinese (Simplified, China) 'zh-hans-sg': 'zh-CN', # Chinese (Simplified, Singapore) 'zh-hant': 'zh-TW', # Chinese (Traditional) - 'zh-hant-hk': 'zh-TW', # Chinese (Traditional, Hongkong) + 'zh-hant-hk': 'zh-HK', # Chinese (Traditional, Hongkong) 'zh-hant-mo': 'zh-TW', # Chinese (Traditional, Macau) 'zh-hant-tw': 'zh-TW', # Chinese (Traditional, Taiwan) # The following are the old-style language codes that django does not recognize - 'zh-hk': 'zh-TW', # Chinese (Traditional, Hongkong) 'zh-mo': 'zh-TW', # Chinese (Traditional, Macau) 'zh-sg': 'zh-CN', # Chinese (Simplified, Singapore) } diff --git a/common/djangoapps/dark_lang/tests.py b/common/djangoapps/dark_lang/tests.py index 16032325d8..c1174adc8b 100644 --- a/common/djangoapps/dark_lang/tests.py +++ b/common/djangoapps/dark_lang/tests.py @@ -217,12 +217,12 @@ class DarkLangMiddlewareTests(TestCase): def test_accept_chinese_language_codes(self): DarkLangConfig( - released_languages=('zh-cn, zh-tw'), + released_languages=('zh-cn, zh-hk, zh-tw'), changed_by=self.user, enabled=True ).save() self.assertAcceptEquals( - 'zh-CN;q=1.0, zh-TW;q=0.5, zh-TW;q=0.3', - self.process_request(accept='zh-Hans;q=1.0, zh-Hant-TW;q=0.5, zh-hk;q=0.3') + 'zh-CN;q=1.0, zh-TW;q=0.5, zh-HK;q=0.3', + self.process_request(accept='zh-Hans;q=1.0, zh-Hant-TW;q=0.5, zh-HK;q=0.3') )