diff options
| -rw-r--r-- | i18nlangtag/qa/cppunit/test_languagetag.cxx | 1 | ||||
| -rw-r--r-- | i18nlangtag/source/isolang/isolang.cxx | 4 | ||||
| -rw-r--r-- | i18npool/source/localedata/data/eu_ES.xml (renamed from i18npool/source/localedata/data/eu.xml) | 4 | ||||
| -rw-r--r-- | i18npool/source/localedata/localedata.cxx | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index 76ef5a36fa05..86964080af2d 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 c005c1988f3d..2161f7af04fb 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 }, @@ -1114,7 +1115,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_INTERLINGUE: diff --git a/i18npool/source/localedata/data/eu.xml b/i18npool/source/localedata/data/eu_ES.xml index 8de7c605bf77..cc7c6d515d21 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 e91ac3f346fe..d8f5ed09371a 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 }, |