diff options
| author | Matthias Seidel <mseidel@apache.org> | 2019-06-18 09:09:30 +0000 |
|---|---|---|
| committer | Matthias Seidel <mseidel@apache.org> | 2019-06-18 09:09:30 +0000 |
| commit | 76c28ecc9c1faa4407dd02101aee57405b76d9d4 (patch) | |
| tree | da1fc1319d341e1260986f4d8e122afb43832c66 | |
| parent | 671db054c3cecb2a109f69d205d45095a94a170c (diff) | |
Additions for new language Amharic (am)
Notes
Notes:
reject: using LANGUAGE_AMHARIC_ETHIOPIA instead
| -rw-r--r-- | i18npool/inc/i18npool/lang.h | 1 | ||||
| -rw-r--r-- | i18npool/source/isolang/isolang.cxx | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h index c06de7b9e030..074de5325bf1 100644 --- a/i18npool/inc/i18npool/lang.h +++ b/i18npool/inc/i18npool/lang.h @@ -110,6 +110,7 @@ typedef unsigned short LanguageType; #define LANGUAGE_AFRIKAANS 0x0436 #define LANGUAGE_ALBANIAN 0x041C #define LANGUAGE_ALSATIAN_FRANCE 0x0484 +#define LANGUAGE_AMHARIC 0x005E #define LANGUAGE_AMHARIC_ETHIOPIA 0x045E #define LANGUAGE_ARABIC_ALGERIA 0x1401 #define LANGUAGE_ARABIC_BAHRAIN 0x3C01 diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx index 250935130ffd..2cef0e44e5e5 100644 --- a/i18npool/source/isolang/isolang.cxx +++ b/i18npool/source/isolang/isolang.cxx @@ -86,10 +86,10 @@ struct IsoLangOtherEntry // language, see code. A call with "en-ZZ" (not in table) would still result in // LANGUAGE_ENGLISH. -/* erAck: 2007-07-05T20:01+0200 TODO: The entire suite's "primary language +/* erAck: 2007-07-05T20:01+0200 TODO: The entire suite's "primary language * only" usage and locale fall back should be cleaned up and made consistent. I * strongly doubt that most callers exactly expect the behavior described. - * Currently these primary LangIDs are used literally in OOo code: + * Currently these primary LangIDs are used literally in AOO code: * LANGUAGE_ENGLISH LANGUAGE_CHINESE LANGUAGE_MALAY * LANGUAGE_AZERI LANGUAGE_URDU LANGUAGE_KASHMIRI */ @@ -335,6 +335,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] = { LANGUAGE_UIGHUR_CHINA, "ug", "CN" }, { LANGUAGE_TIGRIGNA_ETHIOPIA, "ti", "ET" }, { LANGUAGE_TIGRIGNA_ERITREA, "ti", "ER" }, + { LANGUAGE_AMHARIC, "am", "" }, { LANGUAGE_AMHARIC_ETHIOPIA, "am", "ET" }, { LANGUAGE_GUARANI_PARAGUAY, "gug", "PY" }, { LANGUAGE_HAWAIIAN_UNITED_STATES, "haw", "US" }, @@ -933,8 +934,8 @@ LanguageType MsLangId::convertIsoNamesToLanguage( const rtl::OUString& rLang, if ( pFirstLang ) return pFirstLang->mnLang; - // if only the country is set, look for any entry matching the country - // (to allow reading country and language in separate steps, in any order) + // if only the country is set, look for any entry matching the country + // (to allow reading country and language in separate steps, in any order) if ( rCountry.getLength() && !rLang.getLength() ) { const IsoLangEntry* pEntry2 = aImplIsoLangEntries; |