diff options
| author | Eike Rathke <erack@redhat.com> | 2016-01-22 21:46:30 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-01-26 08:35:50 +0000 |
| commit | e0591f72d6088ee392b4c2e41fda8c0dc4faf2a3 (patch) | |
| tree | 8ac2af9ff709ba9d45bfc5dc15a3b1e19fd04789 /i18nlangtag | |
| parent | 290e8e787cc807297725dd41ce7f75817f159c26 (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/21725
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'i18nlangtag')
| -rw-r--r-- | i18nlangtag/qa/cppunit/test_languagetag.cxx | 1 | ||||
| -rw-r--r-- | i18nlangtag/source/isolang/isolang.cxx | 4 |
2 files changed, 3 insertions, 2 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: |