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

Rename local variable to a more consistent name

Browse Source 
Call the info->CanonicalName "shortName", as it's done in many other
places in the code instead of using "locale" for it here, even though we
do use it as a name of locale.

No real changes.
This commit is contained in:
Vadim Zeitlin
2021-02-28 01:11:34 +01:00
parent 5fd85d422f
commit d029279227
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/intl.cpp
View File

@@ -461,11 +461,11 @@ bool wxLocale::Init(int language, int flags)
// Set the locale:
#if defined(__UNIX__)
const wxString& locale = info->CanonicalName;
const wxString& shortName = info->CanonicalName;
const char *retloc = wxSetlocaleTryUTF8(LC_ALL, locale);
const wxString langOnly = ExtractLang(locale);
const wxString langOnly = ExtractLang(shortName);
if ( !retloc )
{
// Some C libraries don't like xx_YY form and require xx only
@@ -478,11 +478,11 @@ bool wxLocale::Init(int language, int flags)
// so will translate the abbrev for them
wxString localeAlt;
if ( langOnly == wxS("he") )
localeAlt = wxS("iw") + ExtractNotLang(locale);
localeAlt = wxS("iw") + ExtractNotLang(shortName);
else if ( langOnly == wxS("id") )
localeAlt = wxS("in") + ExtractNotLang(locale);
localeAlt = wxS("in") + ExtractNotLang(shortName);
else if ( langOnly == wxS("yi") )
localeAlt = wxS("ji") + ExtractNotLang(locale);
localeAlt = wxS("ji") + ExtractNotLang(shortName);
else if ( langOnly == wxS("nb") )
localeAlt = wxS("no_NO");
else if ( langOnly == wxS("nn") )