diff options
author | Eike Rathke <erack@redhat.com> | 2022-10-05 15:53:41 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2022-10-05 17:01:26 +0200 |
commit | 5aa2002644d89ca452b96e664e4d28b191153538 (patch) | |
tree | 11ea4334d069447b6077e9c500ced2d6ad8cae10 /i18nlangtag | |
parent | 5262aab9d220675f616579720b4bb43ee03cccfb (diff) |
More zh-* legacy
Change-Id: I859bb1d100eed0d1940e31575611f34c1c308698
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140982
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'i18nlangtag')
-rw-r--r-- | i18nlangtag/qa/cppunit/test_languagetag.cxx | 3 | ||||
-rw-r--r-- | i18nlangtag/source/isolang/isolang.cxx | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index f7864d6104fd..c64a3baa61d6 100644 --- a/i18nlangtag/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -755,6 +755,9 @@ bool checkMapping( std::u16string_view rStr1, std::u16string_view rStr2 ) if (rStr1 == u"oc-ES" ) return rStr2 == u"oc-ES-aranes"; if (rStr1 == u"zh-Hans-CN" ) return rStr2 == u"zh-CN"; if (rStr1 == u"zh-Hant-TW" ) return rStr2 == u"zh-TW"; + if (rStr1 == u"zh-Hans-SG" ) return rStr2 == u"zh-SG"; + if (rStr1 == u"zh-Hant-HK" ) return rStr2 == u"zh-HK"; + if (rStr1 == u"zh-Hant-MO" ) return rStr2 == u"zh-MO"; return rStr1 == rStr2; } diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index 4287fe247cb4..5204b212d86b 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -756,6 +756,9 @@ IsoLanguageScriptCountryEntry const aImplIsoLangScriptEntries[] = { LANGUAGE_CHINESE_TRADITIONAL_LSO, "zh-Hant", "" , k0 }, { LANGUAGE_CHINESE_SIMPLIFIED, "zh-Hans", "CN", kSAME }, // canonical, but prefer legacy zh-CN { LANGUAGE_CHINESE_TRADITIONAL, "zh-Hant", "TW", kSAME }, // canonical, but prefer legacy zh-TW + { LANGUAGE_CHINESE_SINGAPORE, "zh-Hans", "SG", kSAME }, // canonical, but prefer legacy zh-SG + { LANGUAGE_CHINESE_HONGKONG, "zh-Hant", "HK", kSAME }, // canonical, but prefer legacy zh-HK + { LANGUAGE_CHINESE_MACAU, "zh-Hant", "MO", kSAME }, // canonical, but prefer legacy zh-MO { LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN, "emk-Latn", "GN", k0 }, { LANGUAGE_USER_CREE_PLAINS_LATIN, "crk-Latn", "CA", k0 }, { LANGUAGE_USER_CREE_PLAINS_SYLLABICS, "crk-Cans", "CA", k0 }, |