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@redhat.com>
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 595fd92..925d161 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -742,6 +742,8 @@
    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 97b4f8c..be18383 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -184,7 +184,9 @@
    { 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    },