diff options
| author | Eike Rathke <erack@redhat.com> | 2013-10-25 20:49:44 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-10-29 02:13:25 +0100 |
| commit | 5dc2e3a10a5711253085f38fbba4c75535448302 (patch) | |
| tree | 305ad336a9c4496f4a05f07d38241cd09fb720e5 /i18nlangtag | |
| parent | 8a82cacc668268be2fd5471fe4357d52c4372241 (diff) | |
assume 'ha-*' was indeed used as 'ha-Latn-*'
Change-Id: I5675bf4ee3d255725c1fda2bdd223d7c9d821ab3
Diffstat (limited to 'i18nlangtag')
| -rw-r--r-- | i18nlangtag/qa/cppunit/test_languagetag.cxx | 2 | ||||
| -rw-r--r-- | i18nlangtag/source/isolang/isolang.cxx | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index 0d6f1304b1f8..17217fd08497 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 28bb773b6d9c..9664abf5149f 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 |