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

[Eike Rathke (via logerrit)]

 i18nlangtag/qa/cppunit/test_languagetag.cxx |    2 ++
 i18nlangtag/source/isolang/isolang.cxx      |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit c4f9b1cae7e9400b9aa4bc085ee39371c3b67485
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Wed Jun 5 19:08:42 2019 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Wed Jun 5 23:06:15 2019 +0200

    Related: tdf#125404 alias cmn-CN to zh-CN, cmn-TW to zh-TW
    
    Map 'cmn' Mandarin Chinese with associated country for Simplified
    and Traditional to the technically used 'zh' macrolanguage code.
    
    Change-Id: Ifb8a31e728bbf828f13145513bc56a51684ea134
    Reviewed-on: https://gerrit.libreoffice.org/73563
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 595fd92370e7..925d1615473a 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -742,6 +742,8 @@ bool checkMapping( const OUString& rStr1, const OUString& rStr2 )
     if (rStr1 == "en-GB-oed"   ) return rStr2 == "en-GB-oxendict";
     if (rStr1 == "es-ES_tradnl") return rStr2 == "es-ES-u-co-trad";
     if (rStr1 == "sd-IN"       ) return rStr2 == "sd-Deva-IN";
+    if (rStr1 == "cmn-CN"      ) return rStr2 == "zh-CN";
+    if (rStr1 == "cmn-TW"      ) return rStr2 == "zh-TW";
     return rStr1 == rStr2;
 }
 
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 97b4f8c29a09..be183839fb59 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -184,7 +184,9 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
     { LANGUAGE_GREEK,                       "el", "GR", k0    },
     { LANGUAGE_CHINESE_SIMPLIFIED,          "zh", "CN", k0    },
     { LANGUAGE_CHINESE_SIMPLIFIED_LEGACY,   "zh", "CN", k0    },
+    { LANGUAGE_CHINESE_SIMPLIFIED,         "cmn", "CN", kSAME },
     { LANGUAGE_CHINESE_TRADITIONAL,         "zh", "TW", k0    },
+    { LANGUAGE_CHINESE_TRADITIONAL,        "cmn", "TW", kSAME },
     { LANGUAGE_CHINESE_HONGKONG,            "zh", "HK", k0    },
     { LANGUAGE_CHINESE_SINGAPORE,           "zh", "SG", k0    },
     { LANGUAGE_CHINESE_MACAU,               "zh", "MO", k0    },