diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-05-29 16:24:14 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-05-29 16:27:53 +0200 |
| commit | 8979193090f085d5d171a6daa6f8fa4a188b3130 (patch) | |
| tree | 2d10289826ea9f9f75e576249cd2a7bf4d209858 /i18npool | |
| parent | e7ee6ed3e83673ec747c8b93880a82059eee1657 (diff) | |
Revert "fdo#45830: Indicate correct default locale setting"
This causes a failure in sc_subsequent_filters_test , the test
fails in non-English locales.
This reverts commit 1a5aae96bdb20e36a17d77ec60da874037544628.
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/isolang/mslangid.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx index 8fe16c0b275c..3cd877e4c91b 100644 --- a/i18npool/source/isolang/mslangid.cxx +++ b/i18npool/source/isolang/mslangid.cxx @@ -94,7 +94,10 @@ LanguageType MsLangId::getRealLanguage( LanguageType nLang ) switch (simplifySystemLanguages( nLang)) { case LANGUAGE_SYSTEM : - nLang = getSystemLanguage(); + if (nConfiguredSystemLanguage == LANGUAGE_SYSTEM) + nLang = getSystemLanguage(); + else + nLang = nConfiguredSystemLanguage; break; case LANGUAGE_NONE : if (nConfiguredSystemUILanguage == LANGUAGE_SYSTEM) |