diff options
| author | Eike Rathke <erack@redhat.com> | 2013-09-12 18:33:48 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-09-12 18:44:22 +0200 |
| commit | fa031ec8eb216978b1646ab2459cf5900891d98c (patch) | |
| tree | 4b199efbd0291c57cd33d5ebb9a91fe80bdcecc0 | |
| parent | f4226034189d65b0a90f4e40969bfe6f80b63869 (diff) | |
special case for Pali 'pi-Latn' vs 'pli', fdo#41599 related
Change-Id: I924c87bbbbdd7c58d9e1aca440c6f2aea7bbbcf9
| -rw-r--r-- | i18nlangtag/source/isolang/isolang.cxx | 4 | ||||
| -rw-r--r-- | i18nlangtag/source/languagetag/languagetag.cxx | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index 1abf020d973e..fc412e4914b0 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -522,8 +522,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] = { LANGUAGE_USER_MANX, "gv", "GB", false }, { LANGUAGE_USER_ARAGONESE, "an", "ES", false }, { LANGUAGE_USER_KEYID, "qtz", "" , false }, // key id pseudolanguage used for UI testing - { LANGUAGE_USER_PALI_LATIN, "pi", "" , false }, // Pali with Latin script, ISO 639-1 - { LANGUAGE_USER_PALI_LATIN, "pli", "" , true }, // Pali with Latin script, ISO 639-3 (sigh..) back-compat + { LANGUAGE_USER_PALI_LATIN, "pli", "" , true }, // Pali with Latin script, ISO 639-3 (sigh..) back-compat, Latin is not a default script though.. { LANGUAGE_USER_KYRGYZ_CHINA, "ky", "CN", false }, { LANGUAGE_USER_KOMI_ZYRIAN, "kpv", "RU", false }, { LANGUAGE_USER_KOMI_PERMYAK, "koi", "RU", false }, @@ -582,6 +581,7 @@ static IsoLanguageScriptCountryEntry const aImplIsoLangScriptEntries[] = { LANGUAGE_BOSNIAN_CYRILLIC_BOSNIA_HERZEGOVINA, "bs-Cyrl", "BA" }, { LANGUAGE_AZERI_CYRILLIC, "az-Cyrl", "AZ" }, // macrolanguage code { LANGUAGE_UZBEK_CYRILLIC, "uz-Cyrl", "UZ" }, // macrolanguage code + { LANGUAGE_USER_PALI_LATIN, "pi-Latn", "" }, { LANGUAGE_DONTKNOW, "", "" } // marks end of table }; diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index 504d90a2c4ad..e2f714c7a5c2 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -1268,6 +1268,12 @@ LanguageTag & LanguageTag::makeFallback() aVec.push_back( "sr-Latn"); aVec.push_back( "sr"); } + else if (aLanguage == "pli") + { + // a special case for Pali dictionary, see fdo#41599 + aVec.push_back( "pi-Latn"); + aVec.push_back( "pi"); + } } return aVec; } @@ -1311,6 +1317,8 @@ LanguageTag & LanguageTag::makeFallback() else aVec.push_back( "sh-" + aCountry); } + else if (aLanguage == "pi" && aScript == "Latn") + aVec.push_back( "pli"); // a special case for Pali dictionary, see fdo#41599 } if (!aVariants.isEmpty() && !bHaveLanguageScriptVariant) { |