X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/327bf990ab194b68e162157ac3e03dd5b6449ff4..0d3997fd6d10c1fa80611eaff1c64b6b51cacb74:/src/common/intl.cpp?ds=inline diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 93052fae79..9a2dc00536 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -18,7 +18,7 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__BORLAND__) && !defined(__WXDEBUG__) +#if defined(__BORLANDC__) && !defined(__WXDEBUG__) // There's a bug in Borland's compiler that breaks wxLocale with -O2, // so make sure that flag is not used for this file: #pragma option -O1 @@ -1904,14 +1904,14 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix) !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") ) { - // default C locale - return wxLANGUAGE_ENGLISH; + // default C locale is English too + return wxLANGUAGE_ENGLISH_US; } // 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) { - return AddCatalog(szDomain, wxLANGUAGE_ENGLISH, NULL); + return AddCatalog(szDomain, wxLANGUAGE_ENGLISH_US, NULL); } // add a catalog to our linked list