solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Return wxLANGUAGE_UNKNOWN from GetSystemLocale() in mixed locales

Browse source 
After the changes of the previous commit, GetSystemLocale() started
returning the language, found as due to the fallback logic implemented
in FindLanguageInfo(), for mixed locales, e.g. it would return English
for en_FR which is wrong as the actual locale is rather the French one,
using decimal comma and not period in this case.

Make it always return wxLANGUAGE_UNKNOWN for the mixed locales for now.
This commit is contained in:
Vadim Zeitlin 2023-02-05 15:49:01 +01:00
parent c13b3645a8
commit 9f2a416f81
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/common/uilocale.cpp
View file

@ -679,10 +679,22 @@ int wxUILocale::GetSystemLocale()
{
// Create default wxUILocale
wxUILocale defaultLocale(wxUILocaleImpl::CreateUserDefault());
const wxLocaleIdent locId = defaultLocale.GetLocaleId();
// Find corresponding wxLanguageInfo
const wxLanguageInfo* defaultLanguage = wxUILocale::FindLanguageInfo(defaultLocale.GetLocaleId());
return defaultLanguage ? defaultLanguage->Language : wxLANGUAGE_UNKNOWN;
const wxLanguageInfo* defaultLanguage = wxUILocale::FindLanguageInfo(locId);
// Check if it really corresponds to this locale: we could find it via the
// fallback on the language, which is something that it generally makes
// sense for FindLanguageInfo() to do, but in this case we really need the
// locale.
if ( defaultLanguage &&
locId.GetTag(wxLOCALE_TAGTYPE_BCP47) == defaultLanguage->LocaleTag )
{
return defaultLanguage->Language;
}
return wxLANGUAGE_UNKNOWN;
}
/* static */