C/POSIX locales (or absence of locale information) corresponds to wxLANGUAGE_ENGLISH_...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 93052fae795da92a5c033885fceef5a91d6e2dea..4be838e417ce130bf5185be5a133aa03c9260c54 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1904,14 +1904,14 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
         !wxGetEnv(wxT("LC_MESSAGES"), &langFull) &&
         !wxGetEnv(wxT("LANG"), &langFull))
     {
         !wxGetEnv(wxT("LC_MESSAGES"), &langFull) &&
         !wxGetEnv(wxT("LANG"), &langFull))
     {

-        // no language specified, threat it as English
-        return wxLANGUAGE_ENGLISH;
+        // no language specified, treat it as English
+        return wxLANGUAGE_ENGLISH_US;

     }
 
     if ( langFull == _T("C") || langFull == _T("POSIX") )
     {
     }
 
     if ( langFull == _T("C") || langFull == _T("POSIX") )
     {

-        // default C locale
-        return wxLANGUAGE_ENGLISH;
+        // default C locale is English too
+        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
 bool wxLocale::AddCatalog(const wxChar *szDomain)
 {
 // add a catalog to our linked list
 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