From edc44d944a3465c4387548d2ddd69ba1f67970fe Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Fri, 22 Jan 2016 22:30:39 +0100 Subject: tdf#97315 forward compatibility for [eu-ES] mapping to [eu] Commit 72c5e230f9cda8e18f63f7bbc6567487b4c5a5e0 maps [eu] to [eu-ES] for 5.2 (cherry-picked to 5.1), enable 5.0.5 to read that but still save [eu]. Change-Id: I2aa82023a1ffb411c034beceb0bc999885adb026 Reviewed-on: https://gerrit.libreoffice.org/21728 Reviewed-by: Michael Stahl Reviewed-by: Markus Mohrhard Reviewed-by: David Ostrovsky Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens --- i18nlangtag/qa/cppunit/test_languagetag.cxx | 1 + i18nlangtag/source/isolang/isolang.cxx | 1 + 2 files changed, 2 insertions(+) diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index b76547c426a6..f13863c4bc09 100644 --- a/i18nlangtag/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -665,6 +665,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-ES" ) return rStr2 == "eu"; return rStr1 == rStr2; } diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index ee8406c16de3..c56e14bafd00 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -240,6 +240,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] = { LANGUAGE_USER_ARABIC_SUDAN, "ar", "SD", 0 }, { LANGUAGE_ARABIC_PRIMARY_ONLY, "ar", "" , 0 }, { LANGUAGE_BASQUE, "eu", "" , 0 }, + { LANGUAGE_BASQUE, "eu", "ES", kSAME }, { LANGUAGE_BULGARIAN, "bg", "BG", 0 }, { LANGUAGE_CZECH, "cs", "CZ", 0 }, { LANGUAGE_CZECH, "cz", "" , kSAME }, -- cgit v1.2.3