Merge pull request scelis#304 from apascual/main

Fixed fallback language support and included simplified Chinese
turkdevops · Jul 12, 2021 · 304b3ec · 304b3ec
2 parents 7a77a55 + 790e3f7
commit 304b3ec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/twine/output_processor.rb b/lib/twine/output_processor.rb
@@ -13,6 +13,7 @@ def default_language
 
       def fallback_languages(language)
         fallback_mapping = {
+          'zh-CN' => 'zh-Hans', # if we don't have a zh-CN translation, try zh-Hans before en
           'zh-TW' => 'zh-Hant' # if we don't have a zh-TW translation, try zh-Hant before en
         }
 

diff --git a/lib/twine/twine_file.rb b/lib/twine/twine_file.rb
@@ -44,7 +44,7 @@ def matches_tags?(tags, include_untagged)
     end
 
     def translation_for_lang(lang)
-      translation = [lang].flatten.map { |l| @translations[l] }.first
+      translation = [lang].flatten.map { |l| @translations[l] }.compact.first
 
       translation = reference.translation_for_lang(lang) if translation.nil? && reference