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

[Eike Rathke]

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

New commits:
commit 8697b72ef81aab80b4fd657e5f8d68c9904735dd
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Oct 25 19:35:20 2013 +0200

    Sindhi 'sd-PK' => 'sd-Arab-PK'
    
    Change-Id: I418a991f4555a411ea05237010f64b03552affe5

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index c9b7af6..4ee2d01 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -615,6 +615,7 @@ static bool checkMapping( const OUString rStr1, const OUString& rStr2 )
     if (rStr1 == "pli"         ) return rStr2 == "pi-Latn";
     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";
     return rStr1 == rStr2;
 }
 
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 13e5e4d..e7e2340 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -350,7 +350,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
     { LANGUAGE_ORIYA,                       "or", "IN", 0     },
     { LANGUAGE_PUNJABI,                     "pa", "IN", 0     },
     { LANGUAGE_SANSKRIT,                    "sa", "IN", 0     },
-    { LANGUAGE_SINDHI,                      "sd", "IN", 0     },    // TODO: there's Deva(nagari) and Arab(ic) script, which do we use in 'sd' translation? MS maps this to 'sd-Deva-IN'
+    { LANGUAGE_SINDHI,                      "sd", "IN", 0     },    // TODO: there's Deva(nagari) and Arab(ic) script, MS maps this to 'sd-Deva-IN'
     { LANGUAGE_TAMIL,                       "ta", "IN", 0     },
     { LANGUAGE_TAMIL_SRI_LANKA,             "ta", "LK", 0     },
     { LANGUAGE_TELUGU,                      "te", "IN", 0     },
@@ -358,7 +358,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
     { LANGUAGE_PUNJABI_ARABIC_LSO,         "pnb", ""  , 0     },
     { LANGUAGE_PUNJABI_PAKISTAN,           "lah", "PK", kSAME },    // macrolanguage code, earlier preferred 'lah' over 'pa' for Western Panjabi, now there is 'pnb'
     { LANGUAGE_PUNJABI_PAKISTAN,            "pa", "PK", kSAME },    // MS maps this to 'pa-Arab-PK', but 'pa'='pan' Eastern Panjabi is not used in PK, only in IN
-    { LANGUAGE_SINDHI_PAKISTAN,             "sd", "PK", 0     },    // TODO: there's Deva(nagari) and Arab(ic) script, which do we use in 'sd' translation? MS maps this to 'sd-Arab-PK'
+    { LANGUAGE_SINDHI_PAKISTAN,             "sd", "PK", kSAME },    // Arabic script
     { LANGUAGE_BELARUSIAN,                  "be", "BY", 0     },
     { LANGUAGE_CATALAN,                     "ca", "ES", 0     },    // Spain (default)
     { LANGUAGE_CATALAN,                     "ca", "AD", 0     },    // Andorra
@@ -677,7 +677,7 @@ static IsoLanguageScriptCountryEntry const aImplIsoLangScriptEntries[] =
     { LANGUAGE_UZBEK_LATIN,                         "uz-Latn", "UZ", 0     },   // macrolanguage code
     { LANGUAGE_UZBEK_LATIN_LSO,                     "uz-Latn", ""  , 0     },
 //  { LANGUAGE_SINDHI,                              "sd-Deva", "IN", 0     },   // MS, TODO: see comment above in aImplIsoLangEntries
-//  { LANGUAGE_SINDHI_PAKISTAN,                     "sd-Arab", "PK", 0     },   // MS, TODO: see comment above in aImplIsoLangEntries
+    { LANGUAGE_SINDHI_PAKISTAN,                     "sd-Arab", "PK", 0     },   // MS
     { LANGUAGE_SINDHI_ARABIC_LSO,                   "sd-Arab", ""  , 0     },
     { LANGUAGE_CHEROKEE_UNITED_STATES,             "chr-Cher", "US", 0     },   // MS
     { LANGUAGE_CHEROKEE_CHEROKEE_LSO,              "chr-Cher", ""  , 0     },