Kaydet (Commit) c4f9b1ca authored tarafından Eike Rathke's avatar Eike Rathke

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: 's avatarEike Rathke <erack@redhat.com>
üst 058c54d5
...@@ -742,6 +742,8 @@ bool checkMapping( const OUString& rStr1, const OUString& rStr2 ) ...@@ -742,6 +742,8 @@ bool checkMapping( const OUString& rStr1, const OUString& rStr2 )
if (rStr1 == "en-GB-oed" ) return rStr2 == "en-GB-oxendict"; if (rStr1 == "en-GB-oed" ) return rStr2 == "en-GB-oxendict";
if (rStr1 == "es-ES_tradnl") return rStr2 == "es-ES-u-co-trad"; if (rStr1 == "es-ES_tradnl") return rStr2 == "es-ES-u-co-trad";
if (rStr1 == "sd-IN" ) return rStr2 == "sd-Deva-IN"; 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; return rStr1 == rStr2;
} }
......
...@@ -184,7 +184,9 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] = ...@@ -184,7 +184,9 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_GREEK, "el", "GR", k0 }, { LANGUAGE_GREEK, "el", "GR", k0 },
{ LANGUAGE_CHINESE_SIMPLIFIED, "zh", "CN", k0 }, { LANGUAGE_CHINESE_SIMPLIFIED, "zh", "CN", k0 },
{ LANGUAGE_CHINESE_SIMPLIFIED_LEGACY, "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, "zh", "TW", k0 },
{ LANGUAGE_CHINESE_TRADITIONAL, "cmn", "TW", kSAME },
{ LANGUAGE_CHINESE_HONGKONG, "zh", "HK", k0 }, { LANGUAGE_CHINESE_HONGKONG, "zh", "HK", k0 },
{ LANGUAGE_CHINESE_SINGAPORE, "zh", "SG", k0 }, { LANGUAGE_CHINESE_SINGAPORE, "zh", "SG", k0 },
{ LANGUAGE_CHINESE_MACAU, "zh", "MO", k0 }, { LANGUAGE_CHINESE_MACAU, "zh", "MO", k0 },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment