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

[Eike Rathke]

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

New commits:
commit 5dc2e3a10a5711253085f38fbba4c75535448302
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Oct 25 20:49:44 2013 +0200

    assume 'ha-*' was indeed used as 'ha-Latn-*'
    
    Change-Id: I5675bf4ee3d255725c1fda2bdd223d7c9d821ab3

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 0d6f130..17217fd 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -623,6 +623,8 @@ static bool checkMapping( const OUString rStr1, const OUString& rStr2 )
     if (rStr1 == "sr-Cyrl"     ) return rStr2 == "sr";
     if (rStr1 == "yi-Hebr-US"  ) return rStr2 == "yi-US";
     if (rStr1 == "yi-Hebr-IL"  ) return rStr2 == "yi-IL";
+    if (rStr1 == "ha-NG"       ) return rStr2 == "ha-Latn-NG";
+    if (rStr1 == "ha-GH"       ) return rStr2 == "ha-Latn-GH";
     return rStr1 == rStr2;
 }
 
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 28bb773..9664abf 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -429,8 +429,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
     { LANGUAGE_FULFULDE_NIGERIA,           "fuv", "NG", 0     },
     { LANGUAGE_FULFULDE_NIGERIA,            "ff", "NG", kSAME },    // macrolanguage code
     { LANGUAGE_FULFULDE_SENEGAL,            "ff", "SN", 0     },    // macrolanguage code
-    { LANGUAGE_HAUSA_NIGERIA,               "ha", "NG", 0     },
-    { LANGUAGE_USER_HAUSA_GHANA,            "ha", "GH", 0     },
+    { LANGUAGE_HAUSA_NIGERIA,               "ha", "NG", kSAME },
+    { LANGUAGE_USER_HAUSA_GHANA,            "ha", "GH", kSAME },
     { LANGUAGE_IGBO_NIGERIA,                "ig", "NG", 0     },
     { LANGUAGE_KANURI_NIGERIA,              "kr", "NG", 0     },
     { LANGUAGE_YORUBA,                      "yo", "NG", 0     },
@@ -690,7 +690,7 @@ static IsoLanguageScriptCountryEntry const aImplIsoLangScriptEntries[] =
     { LANGUAGE_KASHMIRI_INDIA,                      "ks-Deva", "IN", 0     },   // MS
     { LANGUAGE_KASHMIRI,                            "ks-Arab", ""  , 0     },   // MS, Kashmiri in "Jammu and Kashmir" ... no ISO3166 code for that
     { LANGUAGE_HAUSA_NIGERIA,                       "ha-Latn", "NG", 0     },   // MS
-    { LANGUAGE_USER_HAUSA_GHANA,                    "ha-Latn", "GH", 0     },   // MS
+    { LANGUAGE_USER_HAUSA_GHANA,                    "ha-Latn", "GH", 0     },
     { LANGUAGE_HAUSA_LATIN_LSO,                     "ha-Latn", ""  , 0     },
     { LANGUAGE_LATIN_LSO,                           "la-Latn", ""  , kSAME },   // MS, though Latn is suppress-script
     { LANGUAGE_TAI_NUA_CHINA,                      "tdd-Tale", "CN", 0     },   // MS reserved