[Libreoffice-commits] core.git: i18nlangtag/qa i18nlangtag/source

[Eike Rathke]

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

New commits:
commit aaba61ba1ff30956b791836cf05d6bd511f26fa2
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Oct 25 20:05:58 2013 +0200

    override 'sr-Cyrl*' with 'sr*'
    
    which is what we so far always used, though Cyrl is not suppress-script
    and would be correct, but it's primary usage.
    
    Change-Id: If7ce7dfcc6b4cc07c503dd2ff2c2bbe2c55c9338

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 4ee2d01..fd6fe43 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -588,7 +588,7 @@ static bool checkMapping( const OUString rStr1, const OUString& rStr2 )
     if (rStr1 == "cz"          ) return rStr2 == "cs-CZ";
     if (rStr1 == "iw-IL"       ) return rStr2 == "he-IL";
     if (rStr1 == "in-ID"       ) return rStr2 == "id-ID";
-    if (rStr1 == "sr-YU"       ) return rStr2 == "sr-Cyrl-CS";
+    if (rStr1 == "sr-YU"       ) return rStr2 == "sr-CS";
     if (rStr1 == "sh-RS"       ) return rStr2 == "sr-Latn-RS";
     if (rStr1 == "sh-YU"       ) return rStr2 == "sr-Latn-CS";
     if (rStr1 == "sh-CS"       ) return rStr2 == "sr-Latn-CS";
@@ -616,6 +616,11 @@ static bool checkMapping( const OUString rStr1, const OUString& rStr2 )
     if (rStr1 == "ks"          ) return rStr2 == "ks-Arab";
     if (rStr1 == "chr-US"      ) return rStr2 == "chr-Cher-US";
     if (rStr1 == "sd-PK"       ) return rStr2 == "sd-Arab-PK";
+    if (rStr1 == "sr-Cyrl-RS"  ) return rStr2 == "sr-RS";
+    if (rStr1 == "sr-Cyrl-ME"  ) return rStr2 == "sr-ME";
+    if (rStr1 == "sr-Cyrl-BA"  ) return rStr2 == "sr-BA";
+    if (rStr1 == "sr-Cyrl-CS"  ) return rStr2 == "sr-CS";
+    if (rStr1 == "sr-Cyrl"     ) return rStr2 == "sr";
     return rStr1 == rStr2;
 }
 
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index d4cfc41..a7e8987 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -650,11 +650,11 @@ static IsoLanguageScriptCountryEntry const aImplIsoLangScriptEntries[] =
     { LANGUAGE_SERBIAN_LATIN_SAM,                   "sr-Latn", "YU", 0     },   // legacy Serbian Latin in Yugoslavia
     { LANGUAGE_SERBIAN_LATIN_LSO,                   "sr-Latn", ""  , 0     },
     { LANGUAGE_SERBIAN_LATIN_NEUTRAL,               "sr-Latn", ""  , 0     },   // MS lists this as 'sr' only, what a mess
-    { LANGUAGE_SERBIAN_CYRILLIC_SERBIA,             "sr-Cyrl", "RS", 0     },   // MS
-    { LANGUAGE_SERBIAN_CYRILLIC_MONTENEGRO,         "sr-Cyrl", "ME", 0     },   // MS
-    { LANGUAGE_SERBIAN_CYRILLIC_BOSNIA_HERZEGOVINA, "sr-Cyrl", "BA", 0     },   // MS
-    { LANGUAGE_SERBIAN_CYRILLIC_SAM,                "sr-Cyrl", "CS", 0     },   // MS
-    { LANGUAGE_SERBIAN_CYRILLIC_LSO,                "sr-Cyrl", ""  , 0     },   // MS
+    { LANGUAGE_SERBIAN_CYRILLIC_SERBIA,             "sr-Cyrl", "RS", kSAME },   // MS
+    { LANGUAGE_SERBIAN_CYRILLIC_MONTENEGRO,         "sr-Cyrl", "ME", kSAME },   // MS
+    { LANGUAGE_SERBIAN_CYRILLIC_BOSNIA_HERZEGOVINA, "sr-Cyrl", "BA", kSAME },   // MS
+    { LANGUAGE_SERBIAN_CYRILLIC_SAM,                "sr-Cyrl", "CS", kSAME },   // MS
+    { LANGUAGE_SERBIAN_CYRILLIC_LSO,                "sr-Cyrl", ""  , kSAME },   // MS
     { LANGUAGE_BOSNIAN_CYRILLIC_BOSNIA_HERZEGOVINA, "bs-Cyrl", "BA", 0     },
     { LANGUAGE_BOSNIAN_CYRILLIC_LSO,                "bs-Cyrl", ""  , 0     },
     { LANGUAGE_AZERI_CYRILLIC,                      "az-Cyrl", "AZ", 0     },   // macrolanguage code