From cbb675a6ccdbd8ac4f9a0af3eee7427b6b28fe92 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Fri, 21 Aug 2015 16:29:10 +0200 Subject: MS finally acknowledged Cuba As per http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/%5BMS-LCID%5D.pdf from https://msdn.microsoft.com/library/cc233965.aspx Release: June 30, 2015; Revision 7.0 So do the mapping from the now obsolete user defined LCID. Change-Id: I57cc5f4bb5d5b86d3c056123fdda9bb50b5b8968 --- i18nlangtag/source/isolang/isolang.cxx | 3 ++- i18nlangtag/source/isolang/mslangid.cxx | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'i18nlangtag') diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index b43424a8ffc5..02b6fb0e318f 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -555,7 +555,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] = { LANGUAGE_USER_ENGLISH_MALAWI, "en", "MW", 0 }, /* en default for MW */ { LANGUAGE_USER_NYANJA, "ny", "MW", 0 }, { LANGUAGE_USER_KASHUBIAN, "csb", "PL", 0 }, - { LANGUAGE_USER_SPANISH_CUBA, "es", "CU", 0 }, + { LANGUAGE_SPANISH_CUBA, "es", "CU", 0 }, + { LANGUAGE_OBSOLETE_USER_SPANISH_CUBA, "es", "CU", 0 }, { LANGUAGE_USER_QUECHUA_NORTH_BOLIVIA, "qul", "BO", 0 }, { LANGUAGE_USER_QUECHUA_SOUTH_BOLIVIA, "quh", "BO", 0 }, { LANGUAGE_USER_BODO_INDIA, "brx", "IN", 0 }, diff --git a/i18nlangtag/source/isolang/mslangid.cxx b/i18nlangtag/source/isolang/mslangid.cxx index 38951c14b6a7..3cc456da9db0 100644 --- a/i18nlangtag/source/isolang/mslangid.cxx +++ b/i18nlangtag/source/isolang/mslangid.cxx @@ -552,6 +552,9 @@ LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang, bo case LANGUAGE_OBSOLETE_USER_KURDISH_IRAQ: nLang = LANGUAGE_KURDISH_ARABIC_IRAQ; break; + case LANGUAGE_OBSOLETE_USER_SPANISH_CUBA: + nLang = LANGUAGE_SPANISH_CUBA; + break; // The following are not strictly obsolete but should be mapped to a // replacement locale when encountered. -- cgit