mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: tdf#73973 it's [crk-Latn-CA] and [crk-Cans-CA]

Browse Source 
Change-Id: I0da8562fc378f873e208919999bfc85f30d26778
This commit is contained in:
Eike Rathke
2016-04-14 14:10:42 +02:00
parent 62633dfe02
commit a2b289c403
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
i18nlangtag/qa/cppunit/test_languagetag.cxx
View File

@@ -685,6 +685,8 @@ 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;
}

6
i18nlangtag/source/isolang/isolang.cxx
View File

@@ -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
};