[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - i18nlangtag/qa i18nlangtag/source

[Eike Rathke]

 i18nlangtag/qa/cppunit/test_languagetag.cxx |    2 ++
 i18nlangtag/source/isolang/isolang.cxx      |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 70341edfa41b3d06fef45c5c24cbf5478830894d
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Apr 14 14:10:42 2016 +0200

    Resolves: tdf#73973 it's [crk-Latn-CA] and [crk-Cans-CA]
    
    (cherry picked from commit a2b289c403b7759032a2a50ae23b27f7bd74409f)
    
     Conflicts:
    	i18nlangtag/qa/cppunit/test_languagetag.cxx
    
    Change-Id: I0da8562fc378f873e208919999bfc85f30d26778
    Reviewed-on: https://gerrit.libreoffice.org/24083
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index f13863c..e85fda8 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -666,6 +666,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-ES"       ) return rStr2 == "eu";
+    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 c56e14b..4107101 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -730,8 +730,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
 };