diff options
| author | Eike Rathke <erack@redhat.com> | 2013-03-28 13:27:42 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-03-28 13:29:58 +0100 |
| commit | 4fb6281270302e26664c2aa09e63b6838dc67d87 (patch) | |
| tree | afe67be76d4bee3e826f2de39975b7365c0f9deb | |
| parent | 0d87455f0dbb07fae67db9cbd2a3d77bbd91a680 (diff) | |
explicit 'en' fallback not needed for 'en-US' reference
If 'en-US' was given, 'en' is part of default fallbacks anyway.
Change-Id: I4f78c60bccd55fcf90f7c7fc99cda25ff1213db8
| -rw-r--r-- | i18npool/source/languagetag/languagetag.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/i18npool/source/languagetag/languagetag.cxx b/i18npool/source/languagetag/languagetag.cxx index be6e228f6ecf..961c8d5f80e7 100644 --- a/i18npool/source/languagetag/languagetag.cxx +++ b/i18npool/source/languagetag/languagetag.cxx @@ -1178,9 +1178,11 @@ LanguageTag::Extraction LanguageTag::simpleExtract( const OUString& rBcp47, ::std::vector< OUString > aFallbacks( LanguageTag( rReference).getFallbackStrings()); aFallbacks.erase( aFallbacks.begin()); // first is full BCP47, we already checked that if (rReference != "en-US") + { aFallbacks.push_back( "en-US"); - if (rReference != "en") - aFallbacks.push_back( "en"); + if (rReference != "en") + aFallbacks.push_back( "en"); + } if (rReference != "x-default") aFallbacks.push_back( "x-default"); if (rReference != "x-no-translate") |