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

Check for C/POSIX locale just after we truncate language string

Browse Source 
This way we can correctly detect C.UTF-8 as C locale.

See https://github.com/wxWidgets/wxWidgets/pull/262

(cherry picked from commit 467dc72fc2)
This commit is contained in:
İsmail Dönmez
2016-03-29 13:59:04 +03:00
committed by Vadim Zeitlin
parent 34c54237fc
commit f358979d35
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/intl.cpp
View File

@@ -629,11 +629,6 @@ inline bool wxGetNonEmptyEnvVar(const wxString& name, wxString* value)
return wxLANGUAGE_ENGLISH_US; return wxLANGUAGE_ENGLISH_US;
} }
if ( langFull == wxS("C") || langFull == wxS("POSIX") )
{
// default C locale is English too
return wxLANGUAGE_ENGLISH_US;
}
#endif #endif
// the language string has the following form // the language string has the following form
@@ -669,6 +664,12 @@ inline bool wxGetNonEmptyEnvVar(const wxString& name, wxString* value)
langFull.Truncate(posEndLang); langFull.Truncate(posEndLang);
} }
if ( langFull == wxS("C") || langFull == wxS("POSIX") )
{
// default C locale is English too
return wxLANGUAGE_ENGLISH_US;
}
// do we have just the language (or sublang too)? // do we have just the language (or sublang too)?
const bool justLang = langFull.find('_') == wxString::npos; const bool justLang = langFull.find('_') == wxString::npos;