[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx  |    3 ++-
 i18nlangtag/source/isolang/mslangid.cxx |    3 +++
 include/i18nlangtag/lang.h              |    4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit cbb675a6ccdbd8ac4f9a0af3eee7427b6b28fe92
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Aug 21 16:29:10 2015 +0200

    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

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index b43424a..02b6fb0 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 38951c1..3cc456d 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.
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 0592072..a8a0cab 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -364,6 +364,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_SPANISH_CHILE              0x340A
 #define LANGUAGE_SPANISH_COLOMBIA           0x240A
 #define LANGUAGE_SPANISH_COSTARICA          0x140A
+#define LANGUAGE_SPANISH_CUBA               0x5C0A
 #define LANGUAGE_SPANISH_DOMINICAN_REPUBLIC 0x1C0A
 #define LANGUAGE_SPANISH_ECUADOR            0x300A
 #define LANGUAGE_SPANISH_EL_SALVADOR        0x440A
@@ -564,7 +565,8 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_HILIGAYNON            0x063D
 #define LANGUAGE_USER_NYANJA                0x063E
 #define LANGUAGE_USER_KASHUBIAN             0x063F
-#define LANGUAGE_USER_SPANISH_CUBA          0x800A  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_SPANISH)) */
+#define LANGUAGE_OBSOLETE_USER_SPANISH_CUBA 0x800A  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_SPANISH)) */
+#define LANGUAGE_USER_SPANISH_CUBA          LANGUAGE_SPANISH_CUBA
 #define LANGUAGE_USER_TETUN                 0x0640
 #define LANGUAGE_USER_QUECHUA_NORTH_BOLIVIA 0x0641
 #define LANGUAGE_USER_QUECHUA_SOUTH_BOLIVIA 0x0642