[Libreoffice-commits] core.git: i18nlangtag/source

[Eike Rathke]

 i18nlangtag/source/languagetag/languagetag.cxx |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 51b810fbf78fa02e2b00dab596551a4f40dbff4b
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Sep 5 09:48:32 2013 +0200

    for all other zh-XX also list zh-CN as fallback
    
    Change-Id: Ie27e743e8fdb03332a72331a7ac2ce72b548fcbc

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index f2f2bec..3491d0a 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -1229,9 +1229,15 @@ LanguageTag & LanguageTag::makeFallback()
         if (!aCountry.isEmpty())
         {
             aVec.push_back( aLanguage + "-" + aCountry);
-            // For zh-HK or zh-MO also list zh-TW
-            if (aLanguage == "zh" && (aCountry == "HK" || aCountry == "MO"))
-                aVec.push_back( aLanguage + "-TW");
+            if (aLanguage == "zh")
+            {
+                // For zh-HK or zh-MO also list zh-TW, for all other zh-XX also
+                // list zh-CN.
+                if (aCountry == "HK" || aCountry == "MO")
+                    aVec.push_back( aLanguage + "-TW");
+                else if (aCountry != "CN")
+                    aVec.push_back( aLanguage + "-CN");
+            }
         }
         aVec.push_back( aLanguage);
         return aVec;