Kaydet (Commit) 01d9d5b4 authored tarafından Eike Rathke's avatar Eike Rathke

Resolves: tdf#116058 add Armenian [hy-IR] [hy-RU] [hyw-AM] [xcl-AM]

Change-Id: I00890f8a7787c7cb9f6016c4283d38b25523a0c9
üst 9938efa7
......@@ -325,6 +325,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_SERBIAN_LATIN_BOSNIA_HERZEGOVINA, "sh", "BA", kSAME }, // legacy kludge, is sr-Latn-BA now
{ LANGUAGE_SERBIAN_LATIN_LSO, "sh", "" , kSAME }, // legacy kludge, is sr-Latn now
{ LANGUAGE_ARMENIAN, "hy", "AM", k0 },
{ LANGUAGE_USER_ARMENIAN_RUSSIA, "hy", "RU", k0 },
{ LANGUAGE_USER_ARMENIAN_IRAN, "hy", "IR", k0 },
{ LANGUAGE_AZERI_LATIN, "az", "AZ", k0 }, // macrolanguage code
{ LANGUAGE_UZBEK_LATIN, "uz", "UZ", k0 }, // macrolanguage code
{ LANGUAGE_UZBEK_LATIN_LSO, "uz", "" , k0 }, // macrolanguage code
......@@ -670,6 +672,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_KITUBA_DRCONGO, "ktu", "CD", k0 },
{ LANGUAGE_USER_FON, "fon", "BJ", k0 },
{ LANGUAGE_USER_PLAUTDIETSCH, "pdt", "CA", k0 },
{ LANGUAGE_USER_ARMENIAN_WESTERN, "hyw", "AM", k0 },
{ LANGUAGE_USER_ARMENIAN_CLASSIC, "xcl", "AM", k0 },
{ LANGUAGE_MULTIPLE, "mul", "" , k0 }, // multiple languages, many languages are used
{ LANGUAGE_UNDETERMINED, "und", "" , k0 }, // undetermined language, language cannot be identified
{ LANGUAGE_NONE, "zxx", "" , k0 }, // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
......
......@@ -144,7 +144,7 @@ namespace o3tl
#define LANGUAGE_ARABIC_TUNISIA LanguageType(0x1C01)
#define LANGUAGE_ARABIC_UAE LanguageType(0x3801)
#define LANGUAGE_ARABIC_YEMEN LanguageType(0x2401)
#define LANGUAGE_ARMENIAN LanguageType(0x042B)
#define LANGUAGE_ARMENIAN LanguageType(0x042B) /* Eastern Armenian */
#define LANGUAGE_ASSAMESE LanguageType(0x044D)
#define LANGUAGE_AZERI_CYRILLIC LanguageType(0x082C)
#define LANGUAGE_AZERI_CYRILLIC_LSO LanguageType(0x742C)
......@@ -736,6 +736,10 @@ namespace o3tl
#define LANGUAGE_USER_KITUBA_DRCONGO LanguageType(0x069C)
#define LANGUAGE_USER_FON LanguageType(0x069D)
#define LANGUAGE_USER_PLAUTDIETSCH LanguageType(0x069E)
#define LANGUAGE_USER_ARMENIAN_RUSSIA LanguageType(0x802B) /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_ARMENIAN)) */
#define LANGUAGE_USER_ARMENIAN_IRAN LanguageType(0x842B) /* makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_ARMENIAN)) */
#define LANGUAGE_USER_ARMENIAN_WESTERN LanguageType(0x069F)
#define LANGUAGE_USER_ARMENIAN_CLASSIC LanguageType(0x06A0)
/* XXX Add new user defined LCIDs ^^^ there.
......
......@@ -59,7 +59,7 @@ const std::pair<const char*, LanguageType> STR_ARR_SVT_LANGUAGE_TABLE[] =
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (UAE)") , LANGUAGE_ARABIC_UAE },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Yemen)") , LANGUAGE_ARABIC_YEMEN },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Aragonese") , LANGUAGE_USER_ARAGONESE },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian") , LANGUAGE_ARMENIAN },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Eastern (Armenia)") , LANGUAGE_ARMENIAN },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Assamese") , LANGUAGE_ASSAMESE },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Azerbaijani Latin") , LANGUAGE_AZERI_LATIN },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Azerbaijani Cyrillic") , LANGUAGE_AZERI_CYRILLIC },
......@@ -406,7 +406,11 @@ const std::pair<const char*, LanguageType> STR_ARR_SVT_LANGUAGE_TABLE[] =
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Xibe") , LANGUAGE_USER_XIBE },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kituba (Democratic Republic of the Congo)"), LANGUAGE_USER_KITUBA_DRCONGO },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Fon"), LANGUAGE_USER_FON },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Plautdietsch"), LANGUAGE_USER_PLAUTDIETSCH }
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Plautdietsch"), LANGUAGE_USER_PLAUTDIETSCH },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Eastern (Russia)") , LANGUAGE_USER_ARMENIAN_RUSSIA },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Eastern (Iran)") , LANGUAGE_USER_ARMENIAN_IRAN },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Western (Armenia)") , LANGUAGE_USER_ARMENIAN_WESTERN },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Classic (Armenia)") , LANGUAGE_USER_ARMENIAN_CLASSIC }
};
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment