summaryrefslogtreecommitdiff
path: root/i18npool/source
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2012-11-27 20:32:10 +0100
committerEike Rathke <erack@redhat.com>2012-11-27 20:35:32 +0100
commitb1d3900317bba8f3d0ab773e517a40b40934e0f7 (patch)
tree663f1e0ab37b79cf6e6926ddbfa42b58ec492c02 /i18npool/source
parent201a3b83d0868c8b0a884a17779b6a4838ed0615 (diff)
do not resolve LANGUAGE_NONE in MsLangId::getRealLanguage()
LANGUAGE_NONE was resolved to UI language, don't do that, if desired use LANGUAGE_HID_HUMAN_INTERFACE_DEVICE instead. Change-Id: I4a45653c9dfef7cc2cddb941ea1174189708cea2
Diffstat (limited to 'i18npool/source')
-rw-r--r--i18npool/source/isolang/mslangid.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx
index 405ce2993704..2395d35cd2f1 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -90,7 +90,7 @@ LanguageType MsLangId::getRealLanguage( LanguageType nLang )
else
nLang = nConfiguredSystemLanguage;
break;
- case LANGUAGE_NONE :
+ case LANGUAGE_HID_HUMAN_INTERFACE_DEVICE :
if (nConfiguredSystemUILanguage == LANGUAGE_SYSTEM)
nLang = getSystemUILanguage();
else
@@ -161,7 +161,7 @@ void MsLangId::Conversion::convertLanguageToLocale( LanguageType nLang,
else
{
// Still resolve LANGUAGE_DONTKNOW if resolving is not requested,
- // but not LANGUAGE_NONE or others.
+ // but not LANGUAGE_SYSTEM or others.
if (bResolveSystem || nLang == LANGUAGE_DONTKNOW)
nLang = MsLangId::getRealLanguage( nLang);
convertLanguageToLocale( nLang, aLocale);