X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a64be16ef8aac40c68ed53cbe0f79979f8f6a898..3586d10f7287c92fc988229c384346f0a04c42ac:/src/common/intl.cpp?ds=sidebyside diff --git a/src/common/intl.cpp b/src/common/intl.cpp index dec5ce8daa..b8fec9fdc7 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -18,12 +18,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __EMX__ -// The following define is needed by Innotek's libc to -// make the definition of struct localeconv available. -#define __INTERNAL_DEFS -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -31,6 +25,12 @@ #pragma hdrstop #endif +#ifdef __EMX__ +// The following define is needed by Innotek's libc to +// make the definition of struct localeconv available. +#define __INTERNAL_DEFS +#endif + #if wxUSE_INTL #ifndef WX_PRECOMP @@ -873,7 +873,7 @@ public: ~wxMsgCatalogFile(); // load the catalog from disk (szDirPrefix corresponds to language) - bool Load(const wxChar *szDirPrefix, const wxChar *szName, + bool Load(const wxString& szDirPrefix, const wxString& szName, wxPluralFormsCalculatorPtr& rPluralFormsCalculator); // fills the hash with string-translation pairs @@ -1015,29 +1015,33 @@ wxMsgCatalogFile::~wxMsgCatalogFile() // return the directories to search for message catalogs under the given // prefix, separated by wxPATH_SEP static -wxString GetMsgCatalogSubdirs(const wxChar *prefix, const wxChar *lang) +wxString GetMsgCatalogSubdirs(const wxString& prefix, const wxString& lang) { - wxString searchPath; - searchPath << prefix << wxFILE_SEP_PATH << lang; - - // Under Unix, the message catalogs are supposed to go into LC_MESSAGES - // subdirectory so look there too. Note that we do it on all platforms - // and not just Unix, because it doesn't cost much to look into one more - // directory and doing it this way has two important benefits: + // Search first in Unix-standard prefix/lang/LC_MESSAGES, then in + // prefix/lang and finally in just prefix. + // + // Note that we use LC_MESSAGES on all platforms and not just Unix, because + // it doesn't cost much to look into one more directory and doing it this + // way has two important benefits: // a) we don't break compatibility with wx-2.6 and older by stopping to // look in a directory where the catalogs used to be and thus silently // breaking apps after they are recompiled against the latest wx // b) it makes it possible to package app's support files in the same // way on all target platforms - const wxString searchPathOrig(searchPath); - searchPath << wxFILE_SEP_PATH << wxT("LC_MESSAGES") - << wxPATH_SEP << searchPathOrig; + wxString pathPrefix; + pathPrefix << prefix << wxFILE_SEP_PATH << lang; + + wxString searchPath; + searchPath.reserve(4*pathPrefix.length()); + searchPath << pathPrefix << wxFILE_SEP_PATH << "LC_MESSAGES" << wxPATH_SEP + << prefix << wxFILE_SEP_PATH << wxPATH_SEP + << pathPrefix; return searchPath; } // construct the search path for the given language -static wxString GetFullSearchPath(const wxChar *lang) +static wxString GetFullSearchPath(const wxString& lang) { // first take the entries explicitly added by the program wxArrayString paths; @@ -1097,7 +1101,7 @@ static wxString GetFullSearchPath(const wxChar *lang) } // open disk file and read in it's contents -bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName, +bool wxMsgCatalogFile::Load(const wxString& szDirPrefix, const wxString& szName, wxPluralFormsCalculatorPtr& rPluralFormsCalculator) { wxString searchPath; @@ -1118,15 +1122,14 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName, searchPath += GetFullSearchPath(szDirPrefix); - const wxChar *sublocale = wxStrchr(szDirPrefix, wxT('_')); - if ( sublocale ) + size_t sublocaleIndex = szDirPrefix.find(wxT('_')); + if ( sublocaleIndex != wxString::npos ) { // also add just base locale name: for things like "fr_BE" (belgium // french) we should use "fr" if no belgium specific message catalogs // exist searchPath << wxPATH_SEP - << GetFullSearchPath(wxString(szDirPrefix). - Left((size_t)(sublocale - szDirPrefix))); + << GetFullSearchPath(szDirPrefix.Left(sublocaleIndex)); } // don't give translation errors here because the wxstd catalog might @@ -1546,7 +1549,7 @@ bool wxLocale::Init(const wxString& name, 256); if (ret != 0) { - m_pszOldLocale = wxStrdup(localeName); + m_pszOldLocale = wxStrdup(wxConvLibc.cWC2MB(localeName)); } else m_pszOldLocale = NULL; @@ -1554,7 +1557,7 @@ bool wxLocale::Init(const wxString& name, // TODO: how to find languageId // SetLocaleInfo(languageId, SORT_DEFAULT, localeName); #else - wxMB2WXbuf oldLocale = wxSetlocale(LC_ALL, szLocale); + const char *oldLocale = wxSetlocale(LC_ALL, szLocale); if ( oldLocale ) m_pszOldLocale = wxStrdup(oldLocale); else @@ -1601,33 +1604,33 @@ bool wxLocale::Init(const wxString& name, #if defined(__UNIX__) && wxUSE_UNICODE && !defined(__WXMAC__) -static wxWCharBuffer wxSetlocaleTryUTF8(int c, const wxChar *lc) +static const char *wxSetlocaleTryUTF8(int c, const wxString& lc) { - wxMB2WXbuf l; + const char *l = NULL; // NB: We prefer to set UTF-8 locale if it's possible and only fall back to // non-UTF-8 locale if it fails - if ( lc && lc[0] != 0 ) + if ( !lc.empty() ) { wxString buf(lc); wxString buf2; buf2 = buf + wxT(".UTF-8"); - l = wxSetlocale(c, buf2.c_str()); + l = wxSetlocale(c, buf2); if ( !l ) { buf2 = buf + wxT(".utf-8"); - l = wxSetlocale(c, buf2.c_str()); + l = wxSetlocale(c, buf2); } if ( !l ) { buf2 = buf + wxT(".UTF8"); - l = wxSetlocale(c, buf2.c_str()); + l = wxSetlocale(c, buf2); } if ( !l ) { buf2 = buf + wxT(".utf8"); - l = wxSetlocale(c, buf2.c_str()); + l = wxSetlocale(c, buf2); } } @@ -1643,6 +1646,8 @@ static wxWCharBuffer wxSetlocaleTryUTF8(int c, const wxChar *lc) bool wxLocale::Init(int language, int flags) { + bool ret = true; + int lang = language; if (lang == wxLANGUAGE_DEFAULT) { @@ -1671,12 +1676,12 @@ bool wxLocale::Init(int language, int flags) // Set the locale: #if defined(__OS2__) - wxMB2WXbuf retloc = wxSetlocale(LC_ALL , wxEmptyString); + const char *retloc = wxSetlocale(LC_ALL , wxEmptyString); #elif defined(__UNIX__) && !defined(__WXMAC__) if (language != wxLANGUAGE_DEFAULT) locale = info->CanonicalName; - wxMB2WXbuf retloc = wxSetlocaleTryUTF8(LC_ALL, locale); + const char *retloc = wxSetlocaleTryUTF8(LC_ALL, locale); const wxString langOnly = locale.Left(2); if ( !retloc ) @@ -1730,10 +1735,7 @@ bool wxLocale::Init(int language, int flags) } if ( !retloc ) - { - wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str()); - return false; - } + ret = false; #ifdef __AIX__ // at least in AIX 5.2 libc is buggy and the string returned from @@ -1743,9 +1745,9 @@ bool wxLocale::Init(int language, int flags) // // this contradicts IBM own docs but this is not of much help, so just work // around it in the crudest possible manner - wxChar *p = wxStrchr((wxChar *)retloc, _T(' ')); + char* p = const_cast(wxStrchr(retloc, ' ')); if ( p ) - *p = _T('\0'); + *p = '\0'; #endif // __AIX__ #elif defined(__WIN32__) @@ -1760,10 +1762,7 @@ bool wxLocale::Init(int language, int flags) #define SETLOCALE_FAILS_ON_UNICODE_LANGS #endif -#if !wxUSE_UNICODE - const -#endif - wxMB2WXbuf retloc = wxT("C"); + const char *retloc = "C"; if (language != wxLANGUAGE_DEFAULT) { if (info->WinLang == 0) @@ -1802,8 +1801,7 @@ bool wxLocale::Init(int language, int flags) if (locale.empty()) { wxLogLastError(wxT("SetThreadLocale")); - wxLogError(wxT("Cannot set locale to language %s."), name.c_str()); - return false; + ret = false; } else { @@ -1812,9 +1810,9 @@ bool wxLocale::Init(int language, int flags) retloc = wxSetlocale(LC_ALL, locale); #endif #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS - if (codepage == 0 && (const wxChar*)retloc == NULL) + if (codepage == 0 && retloc == NULL) { - retloc = wxT("C"); + retloc = "C"; } #endif } @@ -1829,42 +1827,34 @@ bool wxLocale::Init(int language, int flags) retloc = NULL; #endif #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS - if ((const wxChar*)retloc == NULL) + if (retloc == NULL) { wxChar buffer[16]; if (GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_IDEFAULTANSICODEPAGE, buffer, 16) > 0 && wxStrcmp(buffer, wxT("0")) == 0) { - retloc = wxT("C"); + retloc = "C"; } } #endif } if ( !retloc ) - { - wxLogError(wxT("Cannot set locale to language %s."), name.c_str()); - return false; - } + ret = false; #elif defined(__WXMAC__) if (lang == wxLANGUAGE_DEFAULT) locale = wxEmptyString; else locale = info->CanonicalName; - wxMB2WXbuf retloc = wxSetlocale(LC_ALL, locale); + const char *retloc = wxSetlocale(LC_ALL, locale); if ( !retloc ) { // Some C libraries don't like xx_YY form and require xx only retloc = wxSetlocale(LC_ALL, locale.Mid(0,2)); } - if ( !retloc ) - { - wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str()); - return false; - } #else wxUnusedVar(flags); return false; @@ -1872,9 +1862,20 @@ bool wxLocale::Init(int language, int flags) #endif #ifndef WX_NO_LOCALE_SUPPORT - bool ret = Init(name, canonical, retloc, - (flags & wxLOCALE_LOAD_DEFAULT) != 0, - (flags & wxLOCALE_CONV_ENCODING) != 0); + if ( !ret ) + { + wxLogWarning(_("Cannot set locale to language \"%s\"."), name.c_str()); + + // continue nevertheless and try to load at least the translations for + // this language + } + + if ( !Init(name, canonical, retloc, + (flags & wxLOCALE_LOAD_DEFAULT) != 0, + (flags & wxLOCALE_CONV_ENCODING) != 0) ) + { + ret = false; + } if (IsOk()) // setlocale() succeeded m_language = lang; @@ -2561,7 +2562,7 @@ const wxLanguageInfo *wxLocale::FindLanguageInfo(const wxString& locale) // looking // // OTOH, maybe we had already found a language match and in this - // case don't overwrite it becauce the entry for the default + // case don't overwrite it because the entry for the default // country always appears first in ms_languagesDB if ( !infoRet ) infoRet = info; @@ -2674,9 +2675,7 @@ const wxString& wxLocale::GetUntranslatedString(const wxString& str) static wxLocaleUntranslatedStrings s_strings; wxLocaleUntranslatedStrings::iterator i = s_strings.find(str); - if ( i != s_strings.end() ) - return *i; - else + if ( i == s_strings.end() ) return *s_strings.insert(str).first; return *i; @@ -2765,10 +2764,10 @@ bool wxLocale::IsAvailable(int lang) return false; #elif defined(__UNIX__) - - // Test if setting the locale works, then set it back. - wxMB2WXbuf oldLocale = wxSetlocale(LC_ALL, wxEmptyString); - wxMB2WXbuf tmp = wxSetlocaleTryUTF8(LC_ALL, info->CanonicalName); + + // Test if setting the locale works, then set it back. + const char *oldLocale = wxSetlocale(LC_ALL, ""); + const char *tmp = wxSetlocaleTryUTF8(LC_ALL, info->CanonicalName); if ( !tmp ) { // Some C libraries don't like xx_YY form and require xx only @@ -2777,8 +2776,8 @@ bool wxLocale::IsAvailable(int lang) return false; } // restore the original locale - wxSetlocale(LC_ALL, oldLocale); -#endif + wxSetlocale(LC_ALL, oldLocale); +#endif return true; }