#115 Fix showing Chinese translations #33
Merged 6 months ago by codeblock. Opened 6 months ago by alick.
fedora-web/ alick/websites master  into  master

file modified
+18 -2
@@ -76,8 +76,20 @@ 

                            'tr': u'Tϋrkçe',

                            'uk': u'українська',

                            'vi': u'Tiếng Việt',

-                           'zh_CN': u'简体中文',

-                           'zh_TW': u'正體中文'}

+                           'zh_Hans_CN': u'简体中文',

+                           'zh_Hant_TW': u'正體中文'}

+ 

+ # For backward compatibility with commonly used shorter names.

+ ZH_LANGAGUE_MAP = {

+     'zh_CN': 'zh_Hans_CN',

+     'zh_TW': 'zh_Hant_TW',

+     # Following are approximate mapping from region to written language,

+     # since we don't have dedicated translations for them.

+     'zh_SG': 'zh_Hans_CN',

+     'zh_MY': 'zh_Hans_CN',

+     'zh_HK': 'zh_Hant_TW',

+     'zh_MO': 'zh_Hant_TW',

+ }

  

  FEDORA_LANGUAGE_DEFAULT = 'en'

  
@@ -159,6 +171,10 @@ 

  def handle_language_code():

      if request.view_args and 'lang_code' in request.view_args:

          g.current_lang = request.view_args.get('lang_code')

+         # Try to accommodate commonly used shorter Chinese lang_code.

+         if (g.current_lang.startswith('zh')

+             and g.current_lang not in FEDORA_LANGUAGES):

+             g.current_lang = ZH_LANGAGUE_MAP.get(g.current_lang)

          if g.current_lang not in FEDORA_LANGUAGES:

              return abort(404)

          else:

  • Fix showing Chinese translations by using the lang code with scripts (Hans or Hant) that match fedora-web/translations files.
  • Try to accommodate commonly used shorter Chinese lang_code e.g. zh_CN, zh_TW

2 new commits added

  • Recognize commonly used shorter Chinese lang_code
  • fix showing Chinese translations (#33)
6 months ago

Pull-Request has been merged by codeblock

6 months ago
Metadata