diff options
| author | Jürgen Schmidt <jsc@apache.org> | 2014-07-18 10:55:45 +0000 |
|---|---|---|
| committer | Jürgen Schmidt <jsc@apache.org> | 2014-07-18 10:55:45 +0000 |
| commit | 472bb40bf058545fe1755d25b70cdec7a26ed4ec (patch) | |
| tree | bf4e2307003f4dcb88787a98a736daf0fed59e32 /i18npool | |
| parent | fdef33c3dfad1badab0a6f8d447763f565f1fca7 (diff) | |
#125264# add support for ca-XR similar to ca-XV, UI support only
Notes
Notes:
reject: http://www-01.sil.org/iso639-3/cr_files/PastComments/CR_Comments_2006-129.pdf but if someone really wants valencian with racv orthography, its no biggy to give it some ca-valencia-racv tag and register it with IANA
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/inc/i18npool/lang.h | 1 | ||||
| -rw-r--r-- | i18npool/source/isolang/isolang.cxx | 3 | ||||
| -rw-r--r-- | i18npool/source/isolang/mslangid.cxx | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h index 567055ab8df2..e0bda071707a 100644 --- a/i18npool/inc/i18npool/lang.h +++ b/i18npool/inc/i18npool/lang.h @@ -459,6 +459,7 @@ typedef unsigned short LanguageType; #define LANGUAGE_USER_GASCON 0x0636 /* Gascon France */ #define LANGUAGE_USER_GERMAN_BELGIUM 0x8007 /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_GERMAN)) */ #define LANGUAGE_USER_CATALAN_VALENCIAN 0x8003 /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_CATALAN)) */ +#define LANGUAGE_USER_CATALAN_VALENCIAN_RACV 0x8004 /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_CATALAN)) */ #define LANGUAGE_USER_HAUSA_GHANA 0x8068 /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_HAUSA_NIGERIA)) */ #define LANGUAGE_USER_EWE_GHANA 0x0637 #define LANGUAGE_USER_ENGLISH_GHANA 0x8409 /* makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_ENGLISH_US)) */ diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx index 1c339559bbc1..5b4866e35de1 100644 --- a/i18npool/source/isolang/isolang.cxx +++ b/i18npool/source/isolang/isolang.cxx @@ -283,7 +283,8 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] = { LANGUAGE_BELARUSIAN, "be", "BY" }, { LANGUAGE_CATALAN, "ca", "ES" }, // Spain (default) { LANGUAGE_CATALAN, "ca", "AD" }, // Andorra - { LANGUAGE_USER_CATALAN_VALENCIAN, "ca", "XV" }, // XV: ISO 3166 user-assigned; workaround for UI localization only, do not use in document content! + { LANGUAGE_USER_CATALAN_VALENCIAN_RACV, "ca", "XR" }, // XR: ISO ???? user-assigned; workaround for UI localization only, do not use in document content! + { LANGUAGE_USER_CATALAN_VALENCIAN, "ca", "XV" }, // XV: ISO 3166 user-assigned; workaround for UI localization only, do not use in document content! { LANGUAGE_CATALAN, "qcv", "ES" }, // qcv: ISO 639-3 reserved-for-local-use; UI localization quirk only, do not use in document content! // { LANGUAGE_USER_CATALAN_VALENCIAN, "ca", "ES" }, // In case MS format files escaped into the wild, map them back. { LANGUAGE_FRENCH_CAMEROON, "fr", "CM" }, diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx index 3db32b99e39c..2ef84a5e4871 100644 --- a/i18npool/source/isolang/mslangid.cxx +++ b/i18npool/source/isolang/mslangid.cxx @@ -455,9 +455,10 @@ LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang ) nLang = LANGUAGE_SPANISH_MODERN; break; - // Do not use ca-XV for document content. + // Do not use ca-XV, ca-XR for document content. /* TODO: remove in case we implement BCP47 language tags. */ case LANGUAGE_USER_CATALAN_VALENCIAN: + case LANGUAGE_USER_CATALAN_VALENCIAN_RACV: nLang = LANGUAGE_CATALAN; break; } |