mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

override 'yi-Hebr-*' with 'yi-*' as Hebr is suppress-script

Browse Source 
Change-Id: Iaae25a7d517404fc9c8186fd1006f9a4af82f584
This commit is contained in:
Eike Rathke 2013-10-25 20:24:46 +02:00
parent aaba61ba1f
commit 116a888b43
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
i18nlangtag/qa/cppunit/test_languagetag.cxx
View File

@ -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;
}

4
i18nlangtag/source/isolang/isolang.cxx
View File

@ -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