diff options
| -rw-r--r-- | i18nlangtag/source/isolang/isolang.cxx | 7 | ||||
| -rw-r--r-- | include/i18nlangtag/lang.h | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index 2bd6b5e5e229..d64b00f0694a 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -343,7 +343,9 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] = { LANGUAGE_SINDHI, "sd", "IN", kSAME }, // Devanagari script { LANGUAGE_BELARUSIAN, "be", "BY", k0 }, { LANGUAGE_CATALAN, "ca", "ES", k0 }, // Spain (default) - { LANGUAGE_CATALAN, "ca", "AD", k0 }, // Andorra + { LANGUAGE_USER_CATALAN_ANDORRA, "ca", "AD", k0 }, + { LANGUAGE_USER_CATALAN_FRANCE, "ca", "FR", k0 }, + { LANGUAGE_USER_CATALAN_ITALY, "ca", "IT", k0 }, //LANGUAGE_CATALAN_VALENCIAN ca-ES-valencia Bcp47CountryEntry takes precedence { LANGUAGE_CATALAN_VALENCIAN, "ca", "XV", kSAME }, // XV: ISO 3166 user-assigned; old workaround for UI localization only, in case it escaped to document content { LANGUAGE_CATALAN_VALENCIAN, "qcv", "ES", kSAME }, // qcv: ISO 639-3 reserved-for-local-use; old UI localization quirk only, in case it escaped to document content @@ -674,6 +676,9 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] = { LANGUAGE_USER_ENGLISH_ISRAEL, "en", "IL", k0 }, { LANGUAGE_USER_PENNSYLVANIA_DUTCH, "pdc", "US", k0 }, { LANGUAGE_USER_PORTUGUESE_MOZAMBIQUE, "pt", "MZ", k0 }, + { LANGUAGE_USER_SPANISH_EQUATORIAL_GUINEA, "es", "GQ", k0 }, + { LANGUAGE_USER_SPANISH_PHILIPPINES, "es", "PH", k0 }, + { LANGUAGE_USER_ENGLISH_ANTIGUA_BARBUDA,"en", "AG", k0 }, // Add new languages ^^^ there. { LANGUAGE_MULTIPLE, "mul", "" , k0 }, // multiple languages, many languages are used { LANGUAGE_UNDETERMINED, "und", "" , k0 }, // undetermined language, language cannot be identified diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h index 59e20669cddd..55be18878209 100644 --- a/include/i18nlangtag/lang.h +++ b/include/i18nlangtag/lang.h @@ -776,6 +776,12 @@ namespace o3tl #define LANGUAGE_USER_INTERSLAVIC_CYRILLIC LanguageType(0x06AE) #define LANGUAGE_USER_PENNSYLVANIA_DUTCH LanguageType(0x06AF) #define LANGUAGE_USER_PORTUGUESE_MOZAMBIQUE LanguageType(0x8416) /* makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_PORTUGUESE)) */ +#define LANGUAGE_USER_SPANISH_EQUATORIAL_GUINEA LanguageType(0x840A) /* makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_SPANISH)) */ +#define LANGUAGE_USER_SPANISH_PHILIPPINES LanguageType(0x880A) /* makeLangID( 0x22, getPrimaryLanguage( LANGUAGE_SPANISH)) */ +#define LANGUAGE_USER_CATALAN_ANDORRA LanguageType(0x8403) /* makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_CATALAN)) */ +#define LANGUAGE_USER_CATALAN_FRANCE LanguageType(0x8803) /* makeLangID( 0x22, getPrimaryLanguage( LANGUAGE_CATALAN)) */ +#define LANGUAGE_USER_CATALAN_ITALY LanguageType(0x8C03) /* makeLangID( 0x23, getPrimaryLanguage( LANGUAGE_CATALAN)) */ +#define LANGUAGE_USER_ENGLISH_ANTIGUA_BARBUDA LanguageType(0xB809) /* makeLangID( 0x2E, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */ /* XXX Add new user defined LCIDs ^^^ there. |