summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-10-25 20:24:46 +0200
committerEike Rathke <erack@redhat.com>2013-10-25 20:27:03 +0200
commit116a888b43e4df35a2ef1a0e272182722b75d11c (patch)
tree989fc9e0a54105ec8300167bfddd7443559985b6
parentaaba61ba1ff30956b791836cf05d6bd511f26fa2 (diff)
override 'yi-Hebr-*' with 'yi-*' as Hebr is suppress-script
Change-Id: Iaae25a7d517404fc9c8186fd1006f9a4af82f584
-rw-r--r--i18nlangtag/qa/cppunit/test_languagetag.cxx4
-rw-r--r--i18nlangtag/source/isolang/isolang.cxx4
2 files changed, 5 insertions, 3 deletions
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index fd6fe43bcb8c..0d6f1304b1f8 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -604,7 +604,7 @@ static bool checkMapping( const OUString rStr1, const OUString& rStr2 )
if (rStr1 == "qu-EC" ) return rStr2 == "quz-EC";
if (rStr1 == "qu-PE" ) return rStr2 == "quz-PE";
if (rStr1 == "ff-NG" ) return rStr2 == "fuv-NG";
- if (rStr1 == "ji-IL" ) return rStr2 == "yi-Hebr-IL";
+ if (rStr1 == "ji-IL" ) return rStr2 == "yi-IL";
if (rStr1 == "iu-CA" ) return rStr2 == "iu-Latn-CA";
if (rStr1 == "iu" ) return rStr2 == "iu-Latn";
if (rStr1 == "gbz-AF" ) return rStr2 == "prs-AF";
@@ -621,6 +621,8 @@ static bool checkMapping( const OUString rStr1, const OUString& rStr2 )
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";
+ if (rStr1 == "yi-Hebr-US" ) return rStr2 == "yi-US";
+ if (rStr1 == "yi-Hebr-IL" ) return rStr2 == "yi-IL";
return rStr1 == rStr2;
}
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index a7e898787522..28bb773b6d9c 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -672,8 +672,8 @@ static IsoLanguageScriptCountryEntry const aImplIsoLangScriptEntries[] =
{ LANGUAGE_TAJIK_LSO, "tg-Cyrl", "" , 0 }, // MS
{ LANGUAGE_AZERI_LATIN, "az-Latn", "AZ", 0 }, // macrolanguage code; MS
{ LANGUAGE_AZERI_LATIN_LSO, "az-Latn", "" , 0 }, // macrolanguage code; MS
- { LANGUAGE_USER_YIDDISH_US, "yi-Hebr", "US", 0 }, // macrolanguage code; MS
- { LANGUAGE_YIDDISH, "yi-Hebr", "IL", 0 }, // macrolanguage code; MS
+ { LANGUAGE_USER_YIDDISH_US, "yi-Hebr", "US", kSAME }, // macrolanguage code; MS, Hebr is suppress-script
+ { LANGUAGE_YIDDISH, "yi-Hebr", "IL", kSAME }, // macrolanguage code; MS, Hebr is suppress-script
{ 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