i18nlangtag/qa/cppunit/test_languagetag.cxx | 1 +
i18nlangtag/source/isolang/isolang.cxx | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 74afdccae5c4ee0f59f1313ea232ac2719e22ac7
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Mon Nov 8 13:08:54 2021 +0100
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Mon Nov 8 14:38:55 2021 +0100
Convert erroneous kw-UK language tag to kw-GB when encountering
Change-Id: I67a79dab3fac36b494ebc66b81d6d571e2486b1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124842
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 4b9a462f59fb..84e363d01eb4 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -748,6 +748,7 @@ bool checkMapping( std::u16string_view rStr1,
std::u16string_view rStr2 )
if (rStr1 == u"sd-IN" ) return rStr2 == u"sd-Deva-IN";
if (rStr1 == u"cmn-CN" ) return rStr2 == u"zh-CN";
if (rStr1 == u"cmn-TW" ) return rStr2 == u"zh-TW";
+ if (rStr1 == u"kw-UK" ) return rStr2 == u"kw-GB";
return rStr1 == rStr2;
}
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index d13c63e5197b..bf8c5d4b5d34 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -621,7 +621,8 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_SIDAMA, "sid", "ET", k0 },
{ LANGUAGE_USER_NKO, "nqo", "GN", k0 },
{ LANGUAGE_USER_UDMURT, "udm", "RU", k0 },
- { LANGUAGE_USER_CORNISH, "kw", "GB", k0 },
+ { LANGUAGE_USER_CORNISH, "kw", "GB", k0 },
+ { LANGUAGE_USER_CORNISH, "kw", "UK", kSAME }, // old
erroneous tag
{ LANGUAGE_USER_SAMI_PITE_SWEDEN, "sje", "SE", k0 },
{ LANGUAGE_USER_NGAEBERE, "gym", "PA", k0 },
{ LANGUAGE_USER_KUMYK, "kum", "RU", k0 },
