[Libreoffice-commits] core.git: 3 commits - i18nlangtag/source
Eike Rathke
erack at redhat.com
Thu Sep 12 08:49:46 PDT 2013
i18nlangtag/source/isolang/isolang.cxx | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 6056965245915d3aeb84e8ccd065133bdf21d806
Author: Eike Rathke <erack at redhat.com>
Date: Thu Sep 12 17:29:37 2013 +0200
added known unhandled to IsoLanguageScriptCountryEntry
Change-Id: Ica66ae2c7ced84c7d41537197447ebfebf02ddd7
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index da29abf..1abf020 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -277,7 +277,6 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_CROATIAN, "hr", "HR", false }, // Croatian in Croatia
{ LANGUAGE_CROATIAN_BOSNIA_HERZEGOVINA, "hr", "BA", false },
{ LANGUAGE_BOSNIAN_LATIN_BOSNIA_HERZEGOVINA, "bs", "BA", false },
-// { LANGUAGE_BOSNIAN_CYRILLIC_BOSNIA_AND_HERZEGOVINA, "bs", "BA", false }, // script codes not supported yet
{ LANGUAGE_USER_SERBIAN_CYRILLIC_SERBIA, "sr", "RS", false }, // Serbian Cyrillic in Serbia
{ LANGUAGE_SERBIAN_CYRILLIC, "sr", "CS", false }, // Serbian Cyrillic in Serbia and Montenegro
{ LANGUAGE_SERBIAN_CYRILLIC, "sr", "YU", true }, // legacy Serbian Cyrillic in Serbia and Montenegro (former Yugoslavia); kludge, sr_CS not supported by ICU 2.6 (3.4 does)
@@ -290,10 +289,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_SERBIAN_LATIN_BOSNIA_HERZEGOVINA, "sh", "BA", true }, // legacy kludge, is sr-Latn-BA now
{ LANGUAGE_SERBIAN_LATIN_NEUTRAL, "sh", "" , true }, // legacy kludge, is sr-Latn now
{ LANGUAGE_ARMENIAN, "hy", "AM", false },
- { LANGUAGE_AZERI_LATIN, "az", "AZ", false },
-// { LANGUAGE_AZERI_CYRILLIC, "az", "AZ", false }, // script codes not supported yet
- { LANGUAGE_UZBEK_LATIN, "uz", "UZ", false },
-// { LANGUAGE_UZBEK_CYRILLIC, "uz", "UZ", false }, // script codes not supported yet
+ { LANGUAGE_AZERI_LATIN, "az", "AZ", false }, // macrolanguage code
+ { LANGUAGE_UZBEK_LATIN, "uz", "UZ", false }, // macrolanguage code
{ LANGUAGE_BENGALI_BANGLADESH, "bn", "BD", false },
{ LANGUAGE_BENGALI, "bn", "IN", false },
{ LANGUAGE_BURMESE, "my", "MM", false },
@@ -582,6 +579,9 @@ static IsoLanguageScriptCountryEntry const aImplIsoLangScriptEntries[] =
{ LANGUAGE_USER_SERBIAN_LATIN_MONTENEGRO, "sr-Latn", "ME" },
{ LANGUAGE_SERBIAN_LATIN_BOSNIA_HERZEGOVINA,"sr-Latn", "BA" },
{ LANGUAGE_SERBIAN_LATIN_NEUTRAL, "sr-Latn", "" },
+ { 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_DONTKNOW, "", "" } // marks end of table
};
commit 4fe5c3b5cd3425375d7212797dc3d5f7ed14ee2e
Author: Eike Rathke <erack at redhat.com>
Date: Thu Sep 12 16:38:52 2013 +0200
set some mbOverrideExists flags
Change-Id: Iec408fcdc21357fcbb00cdf08215f0db92a48d3c
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 0de5d5a..da29abf 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -214,7 +214,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_BASQUE, "eu", "" , false },
{ LANGUAGE_BULGARIAN, "bg", "BG", false },
{ LANGUAGE_CZECH, "cs", "CZ", false },
- { LANGUAGE_CZECH, "cz", "" , false },
+ { LANGUAGE_CZECH, "cz", "" , true },
{ LANGUAGE_ENGLISH_JAMAICA, "en", "JM", false },
{ LANGUAGE_ENGLISH_CARRIBEAN, "en", "BS", false }, // not 100%, because AG is Bahamas
{ LANGUAGE_ENGLISH_BELIZE, "en", "BZ", false },
@@ -229,11 +229,11 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_GERMAN_LUXEMBOURG, "de", "LU", false },
{ LANGUAGE_GERMAN_LIECHTENSTEIN, "de", "LI", false },
{ LANGUAGE_HEBREW, "he", "IL", false }, // new: old was "iw"
- { LANGUAGE_HEBREW, "iw", "IL", false }, // old: new is "he"
+ { LANGUAGE_HEBREW, "iw", "IL", true }, // old: new is "he"
{ LANGUAGE_HUNGARIAN, "hu", "HU", false },
{ LANGUAGE_ICELANDIC, "is", "IS", false },
{ LANGUAGE_INDONESIAN, "id", "ID", false }, // new: old was "in"
- { LANGUAGE_INDONESIAN, "in", "ID", false }, // old: new is "id"
+ { LANGUAGE_INDONESIAN, "in", "ID", true }, // old: new is "id"
{ LANGUAGE_NORWEGIAN, "no", "NO", false },
{ LANGUAGE_NORWEGIAN_BOKMAL, "nb", "NO", false },
{ LANGUAGE_NORWEGIAN_NYNORSK, "nn", "NO", false },
@@ -360,13 +360,13 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_WELSH, "cy", "GB", false },
{ LANGUAGE_SESOTHO, "st", "ZA", false },
{ LANGUAGE_SEPEDI, "nso", "ZA", false },
- { LANGUAGE_SEPEDI, "ns", "ZA", false }, // fake "ns" for compatibility with existing OOo1.1.x localization to be able to read those documents
+ { LANGUAGE_SEPEDI, "ns", "ZA", true }, // fake "ns" for compatibility with existing OOo1.1.x localization to be able to read those documents
{ LANGUAGE_TSONGA, "ts", "ZA", false },
{ LANGUAGE_TSWANA, "tn", "ZA", false },
{ LANGUAGE_ENGLISH_SAFRICA, "en", "ZA", false },
{ LANGUAGE_AFRIKAANS, "af", "ZA", false },
{ LANGUAGE_VENDA, "ve", "ZA", false }, // default 639-1
- { LANGUAGE_VENDA, "ven", "ZA", false }, // 639-2 may have been used temporarily since 2004-07-23
+ { LANGUAGE_VENDA, "ven", "ZA", true }, // 639-2 may have been used temporarily since 2004-07-23
{ LANGUAGE_XHOSA, "xh", "ZA", false },
{ LANGUAGE_ZULU, "zu", "ZA", false },
{ LANGUAGE_QUECHUA_ECUADOR, "qu", "EC", false },
@@ -396,7 +396,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_ENGLISH_SINGAPORE, "en", "SG", false },
{ LANGUAGE_USER_YIDDISH_US, "yi", "US", false },
{ LANGUAGE_YIDDISH, "yi", "IL", false }, // new: old was "ji"
- { LANGUAGE_YIDDISH, "ji", "IL", false }, // old: new is "yi"
+ { LANGUAGE_YIDDISH, "ji", "IL", true }, // old: new is "yi"
{ LANGUAGE_SYRIAC, "syr", "TR", false }, // "TR" according to http://www.ethnologue.com/show_language.asp?code=SYC
{ LANGUAGE_SINHALESE_SRI_LANKA, "si", "LK", false },
{ LANGUAGE_CHEROKEE_UNITED_STATES, "chr", "US", false },
@@ -526,7 +526,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ 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", "" , false }, // 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
{ LANGUAGE_USER_KYRGYZ_CHINA, "ky", "CN", false },
{ LANGUAGE_USER_KOMI_ZYRIAN, "kpv", "RU", false },
{ LANGUAGE_USER_KOMI_PERMYAK, "koi", "RU", false },
commit 2e60eb57ecc9bddb22e7c3b1ff5d15c34e536c9d
Author: Eike Rathke <erack at redhat.com>
Date: Thu Sep 12 16:22:27 2013 +0200
adapted comment to reality
there is no recursion involved (that was just a bad idea)
Change-Id: I21a3ab9ab653f2cf37f2457b3734215d5b700d14
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 50ce16e..0de5d5a 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -34,8 +34,8 @@ struct IsoLanguageCountryEntry
LanguageType mnLang;
sal_Char maLanguage[4];
sal_Char maCountry[3];
- /** If TRUE, a higher (! else infinite recursion occurs!) level override
- with the same mnLang (!) exists that should be used instead. */
+ /** If TRUE, a higher (!) level override with the same mnLang (!) exists
+ that should be used instead. */
bool mbOverrideExists;
/** Obtain a language tag string with '-' separator. */
More information about the Libreoffice-commits
mailing list