C/POSIX locales (or absence of locale information) corresponds to wxLANGUAGE_ENGLISH_US, not wxLANGUAGE_ENGLISH which is the same as wxLANGUAGE_ENGLISH_UK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1904,14 +1904,14 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
|
|||||||
!wxGetEnv(wxT("LC_MESSAGES"), &langFull) &&
|
!wxGetEnv(wxT("LC_MESSAGES"), &langFull) &&
|
||||||
!wxGetEnv(wxT("LANG"), &langFull))
|
!wxGetEnv(wxT("LANG"), &langFull))
|
||||||
{
|
{
|
||||||
// no language specified, threat it as English
|
// no language specified, treat it as English
|
||||||
return wxLANGUAGE_ENGLISH;
|
return wxLANGUAGE_ENGLISH_US;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( langFull == _T("C") || langFull == _T("POSIX") )
|
if ( langFull == _T("C") || langFull == _T("POSIX") )
|
||||||
{
|
{
|
||||||
// default C locale
|
// default C locale is English too
|
||||||
return wxLANGUAGE_ENGLISH;
|
return wxLANGUAGE_ENGLISH_US;
|
||||||
}
|
}
|
||||||
|
|
||||||
// the language string has the following form
|
// the language string has the following form
|
||||||
@@ -2764,7 +2764,7 @@ bool wxLocale::IsLoaded(const wxChar *szDomain) const
|
|||||||
// add a catalog to our linked list
|
// add a catalog to our linked list
|
||||||
bool wxLocale::AddCatalog(const wxChar *szDomain)
|
bool wxLocale::AddCatalog(const wxChar *szDomain)
|
||||||
{
|
{
|
||||||
return AddCatalog(szDomain, wxLANGUAGE_ENGLISH, NULL);
|
return AddCatalog(szDomain, wxLANGUAGE_ENGLISH_US, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
// add a catalog to our linked list
|
// add a catalog to our linked list
|
||||||
|
Reference in New Issue
Block a user