summaryrefslogtreecommitdiff
path: root/i18nlangtag
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-04-21 11:46:51 +0200
committerEike Rathke <erack@redhat.com>2016-04-21 11:50:21 +0200
commitb481d42e56c9585a3a6018ee851dcca41e89666f (patch)
tree9a2cf619cdca42d96fcb01f3ff64b1159bae6284 /i18nlangtag
parente1af7f0c438bc242e4562aa0286c99787b5ad544 (diff)
also exclude the "specific English" table from mapping to LanguageTag
... otherwise entering a tag for such combination would result in a different locale instead of an on-the-fly assignment. Change-Id: I0c1b2005298cb39f98cf816d4765ce21a5cbc9bc
Diffstat (limited to 'i18nlangtag')
-rw-r--r--i18nlangtag/source/isolang/isolang.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 6add6e3df891..09d1b87ebb49 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -1285,16 +1285,16 @@ LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OUString& rL
pFirstLang = pEntry;
}
}
- }
- // some eng countries should be mapped to a specific english language
- if ( aLowerLang == "en" )
- {
- for (const IsoLangEngEntry* pEngEntry = aImplIsoLangEngEntries;
- pEngEntry->mnLang != LANGUAGE_DONTKNOW; ++pEngEntry)
+ // some eng countries should be mapped to a specific english language
+ if ( aLowerLang == "en" )
{
- if ( aUpperCountry.equalsAscii( pEngEntry->maCountry ) )
- return pEngEntry->mnLang;
+ for (const IsoLangEngEntry* pEngEntry = aImplIsoLangEngEntries;
+ pEngEntry->mnLang != LANGUAGE_DONTKNOW; ++pEngEntry)
+ {
+ if ( aUpperCountry.equalsAscii( pEngEntry->maCountry ) )
+ return pEngEntry->mnLang;
+ }
}
}