[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-0' - i18nlangtag/qa i18nlangtag/source i18npool/Library_localedata_euro.mk i18npool/source

[Eike Rathke]

 i18nlangtag/qa/cppunit/test_languagetag.cxx |    1 
 i18nlangtag/source/isolang/isolang.cxx      |    4 
 i18npool/Library_localedata_euro.mk         |    2 
 i18npool/source/localedata/data/eu.xml      |  376 ----------------------------
 i18npool/source/localedata/data/eu_ES.xml   |  376 ++++++++++++++++++++++++++++
 i18npool/source/localedata/localedata.cxx   |    2 
 6 files changed, 381 insertions(+), 380 deletions(-)

New commits:
commit 2fa74e718363d4874920bb2f71653b386c9f99d0
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jan 22 21:46:30 2016 +0100

    tdf#97315 add Basque [eu-ES] and map [eu] to [eu-ES]
    
    (cherry picked from commit 72c5e230f9cda8e18f63f7bbc6567487b4c5a5e0)
    
    i18npool: fix build
    
    Looks like 72c5e230f9cda8e18f63f7bbc6567487b4c5a5e0 missed the
    makefile change.
    
    (cherry picked from commit a6c8b41c4df79183c5d2c1450c010768ac7d82f6)
    
    2d887ca6cb6c698fdb2d24029f38cce6050e0881
    
    Change-Id: I89641fa82f0d0129aeff0d86a10be26cdc721dfc
    Reviewed-on: https://gerrit.libreoffice.org/21726
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 76ef5a3..8696408 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -684,6 +684,7 @@ static bool checkMapping( const OUString& rStr1, const OUString& rStr2 )
     if (rStr1 == "ku-SY"       ) return rStr2 == "kmr-Latn-SY";
     if (rStr1 == "ku-IQ"       ) return rStr2 == "ckb-IQ";
     if (rStr1 == "ku-IR"       ) return rStr2 == "ckb-IR";
+    if (rStr1 == "eu"          ) return rStr2 == "eu-ES";
     return rStr1 == rStr2;
 }
 
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 3b50dd5..196b9e1 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -239,7 +239,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_ARABIC_SOMALIA,         "ar", "SO", 0     },
     { LANGUAGE_USER_ARABIC_SUDAN,           "ar", "SD", 0     },
     { LANGUAGE_ARABIC_PRIMARY_ONLY,         "ar", ""  , 0     },
-    { LANGUAGE_BASQUE,                      "eu", ""  , 0     },
+    { LANGUAGE_BASQUE,                      "eu", "ES", 0     },
+    { LANGUAGE_BASQUE,                      "eu", ""  , kSAME },    // our earlier definition
     { LANGUAGE_BULGARIAN,                   "bg", "BG", 0     },
     { LANGUAGE_CZECH,                       "cs", "CZ", 0     },
     { LANGUAGE_CZECH,                       "cz", ""  , kSAME },
@@ -1113,7 +1114,6 @@ css::lang::Locale MsLangId::Conversion::lookupFallbackLocale(
                 switch (pEntry->mnLang)
                 {
                     // These are known to have no country assigned.
-                    case LANGUAGE_BASQUE:
                     case LANGUAGE_USER_ESPERANTO:
                     case LANGUAGE_USER_INTERLINGUA:
                     case LANGUAGE_USER_LOJBAN:
diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk
index 9b5aaae..caece13 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\
 	CustomTarget/i18npool/localedata/localedata_dsb_DE \
 	CustomTarget/i18npool/localedata/localedata_el_GR \
 	CustomTarget/i18npool/localedata/localedata_et_EE \
-	CustomTarget/i18npool/localedata/localedata_eu \
+	CustomTarget/i18npool/localedata/localedata_eu_ES \
 	CustomTarget/i18npool/localedata/localedata_fi_FI \
 	CustomTarget/i18npool/localedata/localedata_fo_FO \
 	CustomTarget/i18npool/localedata/localedata_fr_BE \
diff --git a/i18npool/source/localedata/data/eu.xml b/i18npool/source/localedata/data/eu_ES.xml
similarity index 99%
rename from i18npool/source/localedata/data/eu.xml
rename to i18npool/source/localedata/data/eu_ES.xml
index 8de7c60..cc7c6d5 100644
--- a/i18npool/source/localedata/data/eu.xml
+++ b/i18npool/source/localedata/data/eu_ES.xml
@@ -24,8 +24,8 @@
       <DefaultName>Basque</DefaultName>
     </Language>
     <Country>
-      <CountryID/>
-      <DefaultName/>
+      <CountryID>ES</CountryID>
+      <DefaultName>Spain</DefaultName>
     </Country>
   </LC_INFO>
   <LC_CTYPE>
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index e91ac3f3..d8f5ed0 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -152,7 +152,7 @@ static const struct {
     { "sr_CS",  lcl_DATA_EURO },
     { "hr_HR",  lcl_DATA_EURO },
     { "bs_BA",  lcl_DATA_EURO },
-    { "eu",     lcl_DATA_EURO },
+    { "eu_ES",  lcl_DATA_EURO },
     { "fo_FO",  lcl_DATA_EURO },
     { "ga_IE",  lcl_DATA_EURO },
     { "gd_GB",  lcl_DATA_EURO },