summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-04-14 14:10:42 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-04-14 13:52:19 +0000
commitc9d5d68a2617f54f38222fc147183d91017b3b99 (patch)
treea340f4080c55fc805f06fac82bbf17d5b446cf33
parentab951b113d66e4ba8dc0ba15a801d43dd377ddf9 (diff)
Resolves: tdf#73973 it's [crk-Latn-CA] and [crk-Cans-CA]
Change-Id: I0da8562fc378f873e208919999bfc85f30d26778 (cherry picked from commit a2b289c403b7759032a2a50ae23b27f7bd74409f) Reviewed-on: https://gerrit.libreoffice.org/24082 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--i18nlangtag/qa/cppunit/test_languagetag.cxx2
-rw-r--r--i18nlangtag/source/isolang/isolang.cxx6
2 files changed, 6 insertions, 2 deletions
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 86964080af2d..29e947becf45 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -685,6 +685,8 @@ static bool checkMapping( const OUString& rStr1, const OUString& rStr2 )
if (rStr1 == "ku-IQ" ) return rStr2 == "ckb-IQ";
if (rStr1 == "ku-IR" ) return rStr2 == "ckb-IR";
if (rStr1 == "eu" ) return rStr2 == "eu-ES";
+ if (rStr1 == "crk-Latn-CN" ) return rStr2 == "crk-Latn-CA";
+ if (rStr1 == "crk-Cans-CN" ) return rStr2 == "crk-Cans-CA";
return rStr1 == rStr2;
}
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 196b9e1c00fd..426f4a395af5 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -740,8 +740,10 @@ static IsoLanguageScriptCountryEntry const aImplIsoLangScriptEntries[] =
{ LANGUAGE_BOSNIAN_LATIN_LSO, "bs-Latn", "" , LANGUAGE_BOSNIAN_LSO }, // MS, though Latn is suppress-script
{ LANGUAGE_CHINESE_TRADITIONAL_LSO, "zh-Hant", "" , 0 },
{ LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN, "emk-Latn", "GN", 0 },
- { LANGUAGE_USER_CREE_PLAINS_LATIN, "crk-Latn", "CN", 0 },
- { LANGUAGE_USER_CREE_PLAINS_SYLLABICS, "crk-Cans", "CN", 0 },
+ { LANGUAGE_USER_CREE_PLAINS_LATIN, "crk-Latn", "CA", 0 },
+ { LANGUAGE_USER_CREE_PLAINS_SYLLABICS, "crk-Cans", "CA", 0 },
+ { LANGUAGE_USER_CREE_PLAINS_LATIN, "crk-Latn", "CN", kSAME }, // erroneous tdf#73973
+ { LANGUAGE_USER_CREE_PLAINS_SYLLABICS, "crk-Cans", "CN", kSAME }, // erroneous tdf#73973
{ LANGUAGE_DONTKNOW, "", "" , 0 } // marks end of table
};