Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add wxSetlocaleTryAll() helper to simplify Unix locale code

Browse Source 
Define the function calling setlocale("xx_YY") first and then just
setlocale("xx") if the former failed, instead of doing the same thing
manually in 3 different places.

Also avoid attempting the second setlocale() call completely if there is
no "_YY" part in the first place.

No real changes.
This commit is contained in:
Vadim Zeitlin
2021-02-28 22:46:09 +01:00
parent 91ec900034
commit 2e8e0197d7
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/common/intl.cpp
View File

@@ -386,6 +386,9 @@ bool wxLocale::DoCommonPostInit(bool success,
} }
#if defined(__UNIX__) #if defined(__UNIX__)
// Helper of wxSetlocaleTryAll() below which tries setting the given locale
// with and without UTF-8 suffix. Don't use this one directly.
static const char *wxSetlocaleTryUTF8(int c, const wxString& lc) static const char *wxSetlocaleTryUTF8(int c, const wxString& lc)
{ {
const char *l = NULL; const char *l = NULL;
@@ -425,6 +428,22 @@ static const char *wxSetlocaleTryUTF8(int c, const wxString& lc)
return l; return l;
} }
// Try setting all possible versions of the given locale, i.e. with and without
// UTF-8 encoding, and with or without the "_territory" part.
static const char *wxSetlocaleTryAll(int c, const wxString& lc)
{
const char* l = wxSetlocaleTryUTF8(c, lc);
if ( !l )
{
const wxString& lcOnlyLang = ExtractLang(lc);
if ( lcOnlyLang != lc )
l = wxSetlocaleTryUTF8(c, lcOnlyLang);
}
return l;
}
#endif // __UNIX__ #endif // __UNIX__
bool wxLocale::Init(int lang, int flags) bool wxLocale::Init(int lang, int flags)
@@ -468,20 +487,14 @@ bool wxLocale::Init(int lang, int flags)
// Set the locale: // Set the locale:
#if defined(__UNIX__) #if defined(__UNIX__)
const char *retloc = wxSetlocaleTryUTF8(LC_ALL, shortName); const char *retloc = wxSetlocaleTryAll(LC_ALL, shortName);
const wxString langOnly = ExtractLang(shortName);
if ( !retloc )
{
// Some C libraries don't like xx_YY form and require xx only
retloc = wxSetlocaleTryUTF8(LC_ALL, langOnly);
}
if ( !retloc ) if ( !retloc )
{ {
// Some C libraries (namely glibc) still use old ISO 639, // Some C libraries (namely glibc) still use old ISO 639,
// so will translate the abbrev for them // so will translate the abbrev for them
wxString localeAlt; wxString localeAlt;
const wxString& langOnly = ExtractLang(shortName);
if ( langOnly == wxS("he") ) if ( langOnly == wxS("he") )
localeAlt = wxS("iw") + ExtractNotLang(shortName); localeAlt = wxS("iw") + ExtractNotLang(shortName);
else if ( langOnly == wxS("id") ) else if ( langOnly == wxS("id") )
@@ -494,11 +507,7 @@ bool wxLocale::Init(int lang, int flags)
localeAlt = wxS("no_NY"); localeAlt = wxS("no_NY");
if ( !localeAlt.empty() ) if ( !localeAlt.empty() )
{ retloc = wxSetlocaleTryAll(LC_ALL, localeAlt);
retloc = wxSetlocaleTryUTF8(LC_ALL, localeAlt);
if ( !retloc )
retloc = wxSetlocaleTryUTF8(LC_ALL, ExtractLang(localeAlt));
}
} }
#ifdef __AIX__ #ifdef __AIX__
@@ -1096,11 +1105,7 @@ bool wxLocale::IsAvailable(int lang)
// Test if setting the locale works, then set it back. // Test if setting the locale works, then set it back.
char * const oldLocale = wxStrdupA(setlocale(LC_ALL, NULL)); char * const oldLocale = wxStrdupA(setlocale(LC_ALL, NULL));
// Some platforms don't like xx_YY form and require xx only so test for const bool available = wxSetlocaleTryAll(LC_ALL, info->CanonicalName);
// it too.
const bool
available = wxSetlocaleTryUTF8(LC_ALL, info->CanonicalName) ||
wxSetlocaleTryUTF8(LC_ALL, ExtractLang(info->CanonicalName));
// restore the original locale // restore the original locale
wxSetlocale(LC_ALL, oldLocale); wxSetlocale(LC_ALL, oldLocale);