diff options
| author | Eike Rathke <erack@redhat.com> | 2016-01-22 21:46:30 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-01-26 20:51:21 +0000 |
| commit | 2fa74e718363d4874920bb2f71653b386c9f99d0 (patch) | |
| tree | eaa2f03a08ea883792a106b53bae14362b16d369 | |
| parent | f3a1b5ef1d5d8995156092dcbd8ebc39608ff3bd (diff) | |
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@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | i18nlangtag/qa/cppunit/test_languagetag.cxx | 1 | ||||
| -rw-r--r-- | i18nlangtag/source/isolang/isolang.cxx | 4 | ||||
| -rw-r--r-- | i18npool/Library_localedata_euro.mk | 2 | ||||
| -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 |
5 files changed, 7 insertions, 6 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 3b50dd58d994..196b9e1c00fd 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 9b5aaaec1a45..caece13427bf 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 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 }, |