Map MS malformed es-ES_tradnl to proper BCP 47 es-ES-u-co-trad, tdf#83190

See
BCP 47 Extension U
https://tools.ietf.org/html/rfc6067
and
http://www.unicode.org/repos/cldr/tags/latest/common/bcp47/collation.xml
http://www.unicode.org/repos/cldr/trunk/common/bcp47/collation.xml

Change-Id: I2b946ab00c2efdc1a877a5e6ce91bc703bcd9db0

i18nlangtag/qa/cppunit/test_languagetag.cxx

@@ -691,6 +691,7 @@ bool checkMapping( const OUString& rStr1, const OUString& rStr2 )
     if (rStr1 == "crk-Latn-CN" ) return rStr2 == "crk-Latn-CA";
     if (rStr1 == "crk-Cans-CN" ) return rStr2 == "crk-Cans-CA";
     if (rStr1 == "en-GB-oed"   ) return rStr2 == "en-GB-oxendict";
+    if (rStr1 == "es-ES_tradnl") return rStr2 == "es-ES-u-co-trad";
     return rStr1 == rStr2;
 }
 

i18nlangtag/source/isolang/isolang.cxx

@@ -180,7 +180,6 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
     { LANGUAGE_ITALIAN,                     "it", "IT", k0     },
     { LANGUAGE_DUTCH,                       "nl", "NL", k0     },
     { LANGUAGE_SPANISH_MODERN,              "es", "ES", k0     },
-    { LANGUAGE_SPANISH_DATED,               "es", "ES", k0     },
     { LANGUAGE_PORTUGUESE,                  "pt", "PT", k0     },
     { LANGUAGE_PORTUGUESE_BRAZILIAN,        "pt", "BR", k0     },
     { LANGUAGE_DANISH,                      "da", "DK", k0     },
@@ -763,6 +762,8 @@ static Bcp47CountryEntry const aImplBcp47CountryEntries[] =
     { LANGUAGE_OBSOLETE_USER_CATALAN_VALENCIAN, "ca-ES-valencia", "ES", "", k0 },   // In case MS format files using the old value escaped into the wild, map them back.
     { LANGUAGE_USER_ENGLISH_UK_OXENDICT, "en-GB-oxendict", "GB", "", k0 },
     { LANGUAGE_USER_ENGLISH_UK_OED,           "en-GB-oed", "GB", "", LANGUAGE_USER_ENGLISH_UK_OXENDICT },   // grandfathered, deprecated, prefer en-GB-oxendict
+    { LANGUAGE_SPANISH_DATED,           "es-ES-u-co-trad", "ES", "es-u-co-trad", k0 },  // RFC6067/CLDR
+    { LANGUAGE_SPANISH_DATED,              "es-ES_tradnl", "ES", "", kSAME },           // MS malformed
 //  { LANGUAGE_YUE_CHINESE_HONGKONG,         "zh-yue-HK", "HK", "", 0 },   // MS reserved, prefer yue-HK; do not add unless LanguageTag::simpleExtract() can handle it to not call liblangtag for rsc!
     { LANGUAGE_DONTKNOW,                    "", "", "", k0 }    // marks end of table
 };

i18nlangtag/source/isolang/mslangid.cxx

@@ -539,11 +539,6 @@ LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang )
     else if (nLang == LANGUAGE_NORWEGIAN)
         nLang = LANGUAGE_NORWEGIAN_BOKMAL;
 
-    // #i94435# A Spanish variant that differs only in collation details we
-    // do not support.
-    else if (nLang == LANGUAGE_SPANISH_DATED)
-        nLang = LANGUAGE_SPANISH_MODERN;
-
     // The erroneous Tibetan vs. Dzongkha case, #i53497#
     // We (and MS) have stored LANGUAGE_TIBETAN_BHUTAN. This will need
     // special attention if MS one day decides to actually use