tdf#97315 add Basque [eu-ES] and map [eu] to [eu-ES]

Change-Id: I89641fa82f0d0129aeff0d86a10be26cdc721dfc
This commit is contained in:
Eike Rathke
2016-01-22 21:50:00 +01:00
parent 4350788238
commit 72c5e230f9
4 changed files with 6 additions and 5 deletions
@@ -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;
}
+2 -2
View File
@@ -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:
@@ -24,8 +24,8 @@
<DefaultName>Basque</DefaultName>
</Language>
<Country>
<CountryID/>
<DefaultName/>
<CountryID>ES</CountryID>
<DefaultName>Spain</DefaultName>
</Country>
</LC_INFO>
<LC_CTYPE>
+1 -1
View File
@@ -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 },