X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cb06872875266c75de8cf11c668a1dd733d1fcd..9f542367b72dd900a914c163df7f23ca5e79a60c:/src/common/intl.cpp diff --git a/src/common/intl.cpp b/src/common/intl.cpp index fd08730d8e..31332b83ba 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -18,10 +18,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "intl.h" -#endif - #if defined(__BORLAND__) && !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: @@ -107,6 +103,8 @@ static const size_t LEN_LANG = 2; static const size_t LEN_SUBLANG = 2; static const size_t LEN_FULL = LEN_LANG + 1 + LEN_SUBLANG; // 1 for '_' +#define TRACE_I18N _T("i18n") + // ---------------------------------------------------------------------------- // global functions // ---------------------------------------------------------------------------- @@ -504,7 +502,7 @@ private: wxPluralFormsNodePtr m_plural; }; -wxDEFINE_SCOPED_PTR_TYPE(wxPluralFormsCalculator); +wxDEFINE_SCOPED_PTR_TYPE(wxPluralFormsCalculator) void wxPluralFormsCalculator::init(wxPluralFormsToken::Number nplurals, wxPluralFormsNode* plural) @@ -1076,13 +1074,24 @@ static wxString GetFullSearchPath(const wxChar *lang) bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName, wxPluralFormsCalculatorPtr& rPluralFormsCalculator) { - /* - We need to handle locales like de_AT.iso-8859-1 - For this we first chop off the .CHARSET specifier and ignore it. - FIXME: UNICODE SUPPORT: must use CHARSET specifier! - */ + wxString searchPath; + +#if wxUSE_FONTMAP + // first look for the catalog for this language and the current locale: + // notice that we don't use the system name for the locale as this would + // force us to install catalogs in different locations depending on the + // system but always use the canonical name + wxFontEncoding encSys = wxLocale::GetSystemEncoding(); + if ( encSys != wxFONTENCODING_SYSTEM ) + { + wxString fullname(szDirPrefix); + fullname << _T('.') << wxFontMapperBase::GetEncodingName(encSys); + searchPath << GetFullSearchPath(fullname) << wxPATH_SEP; + } +#endif // wxUSE_FONTMAP + - wxString searchPath = GetFullSearchPath(szDirPrefix); + searchPath += GetFullSearchPath(szDirPrefix); const wxChar *sublocale = wxStrchr(szDirPrefix, wxT('_')); if ( sublocale ) { @@ -1102,30 +1111,37 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName, NoTransErr noTransErr; wxLogVerbose(_("looking for catalog '%s' in path '%s'."), szName, searchPath.c_str()); + wxLogTrace(TRACE_I18N, _T("Looking for \"%s.mo\" in \"%s\""), + szName, searchPath.c_str()); wxFileName fn(szName); fn.SetExt(_T("mo")); wxString strFullName; if ( !wxFindFileInPath(&strFullName, searchPath, fn.GetFullPath()) ) { wxLogVerbose(_("catalog file for domain '%s' not found."), szName); + wxLogTrace(TRACE_I18N, _T("Catalog \"%s.mo\" not found"), szName); return false; } // open file wxLogVerbose(_("using catalog '%s' from '%s'."), szName, strFullName.c_str()); + wxLogTrace(TRACE_I18N, _T("Using catalog \"%s\"."), strFullName.c_str()); wxFile fileMsg(strFullName); if ( !fileMsg.IsOpened() ) return false; // get the file size (assume it is less than 4Gb...) - wxFileOffset nSize = fileMsg.Length(); - if ( nSize == wxInvalidOffset ) + wxFileOffset lenFile = fileMsg.Length(); + if ( lenFile == wxInvalidOffset ) return false; + size_t nSize = wx_truncate_cast(size_t, lenFile); + wxASSERT_MSG( nSize == lenFile, _T("message catalog bigger than 4GB?") ); + // read the whole file in memory m_pData = new size_t8[nSize]; - if ( fileMsg.Read(m_pData, (size_t)nSize) != nSize ) { + if ( fileMsg.Read(m_pData, nSize) != lenFile ) { wxDELETEA(m_pData); return false; } @@ -1200,8 +1216,7 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName, } else { - wxLogVerbose(_("Cannot parse Plural-Forms:'%s'"), - pfs.c_str()); + wxLogVerbose(_("Cannot parse Plural-Forms:'%s'"), pfs.c_str()); } } } @@ -1233,15 +1248,28 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, #endif // wxUSE_FONTMAP #if wxUSE_WCHAR_T - wxCSConv *csConv = NULL; - if ( !m_charset.empty() ) - csConv = new wxCSConv(m_charset); - - wxMBConv& inputConv = csConv ? *((wxMBConv*)csConv) : *wxConvCurrent; + // conversion to use to convert catalog strings to the GUI encoding + wxMBConv *inputConv, + *csConv = NULL; // another ptr just to be able to delete it later + if ( convertEncoding ) + { + if ( m_charset.empty() ) + inputConv = wxConvCurrent; + else + inputConv = + csConv = new wxCSConv(m_charset); + } + else // no conversion needed + { + inputConv = NULL; + } - wxCSConv *sourceConv = NULL; - if ( !msgIdCharset.empty() && (m_charset != msgIdCharset) ) - sourceConv = new wxCSConv(msgIdCharset); + // conversion to apply to msgid strings before looking them up: we only + // need it if the msgids are neither in 7 bit ASCII nor in the same + // encoding as the catalog + wxCSConv *sourceConv = msgIdCharset.empty() || (msgIdCharset == m_charset) + ? NULL + : new wxCSConv(msgIdCharset); #elif wxUSE_FONTMAP wxASSERT_MSG( msgIdCharset == NULL, @@ -1284,12 +1312,12 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, { const char *data = StringAtOfs(m_pOrigTable, i); #if wxUSE_UNICODE - wxString msgid(data, inputConv); -#else + wxString msgid(data, *inputConv); +#else // ASCII wxString msgid; #if wxUSE_WCHAR_T - if ( convertEncoding && sourceConv ) - msgid = wxString(inputConv.cMB2WC(data), *sourceConv); + if ( inputConv && sourceConv ) + msgid = wxString(inputConv->cMB2WC(data), *sourceConv); else #endif msgid = data; @@ -1304,10 +1332,10 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, wxString msgstr; #if wxUSE_WCHAR_T #if wxUSE_UNICODE - msgstr = wxString(data + offset, inputConv); + msgstr = wxString(data + offset, *inputConv); #else - if ( convertEncoding ) - msgstr = wxString(inputConv.cMB2WC(data + offset), wxConvLocal); + if ( inputConv ) + msgstr = wxString(inputConv->cMB2WC(data + offset), wxConvLocal); else msgstr = wxString(data + offset); #endif @@ -1387,7 +1415,7 @@ const wxChar *wxMsgCatalog::GetString(const wxChar *sz, size_t n) const #include "wx/arrimpl.cpp" WX_DECLARE_EXPORTED_OBJARRAY(wxLanguageInfo, wxLanguageInfoArray); -WX_DEFINE_OBJARRAY(wxLanguageInfoArray); +WX_DEFINE_OBJARRAY(wxLanguageInfoArray) wxLanguageInfoArray *wxLocale::ms_languagesDB = NULL; @@ -1571,6 +1599,18 @@ bool wxLocale::Init(int language, int flags) wxMB2WXbuf retloc = wxSetlocaleTryUTF(LC_ALL, locale); +#ifdef __AIX__ + // at least in AIX 5.2 libc is buggy and the string returned from setlocale(LC_ALL) + // can't be passed back to it because it returns 6 strings (one for each locale + // category), i.e. for C locale we get back "C C C C C C" + // + // 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(' ')); + if ( p ) + *p = _T('\0'); +#endif // __AIX__ + if ( !retloc ) { // Some C libraries don't like xx_YY form and require xx only @@ -2238,35 +2278,9 @@ wxString wxLocale::GetSystemEncodingName() if ( alang ) { - // 7 bit ASCII encoding has several alternative names which we should - // recognize to avoid warnings about unrecognized encoding on each - // program startup - - // nl_langinfo() under Solaris returns 646 by default which stands for - // ISO-646, i.e. 7 bit ASCII - // - // and recent glibc call it ANSI_X3.4-1968... - // - // HP-UX uses HP-Roman8 cset which is not the same as ASCII (see RFC - // 1345 for its definition) but must be recognized as otherwise HP - // users get a warning about it on each program startup, so handle it - // here -- but it would be obviously better to add real supprot to it, - // of course! - if ( strcmp(alang, "646") == 0 - || strcmp(alang, "ANSI_X3.4-1968") == 0 -#ifdef __HPUX__ - || strcmp(alang, "roman8") == 0 -#endif // __HPUX__ - ) - { - encname = _T("US-ASCII"); - } - else - { - encname = wxString::FromAscii( alang ); - } + encname = wxString::FromAscii( alang ); } - else + else // nl_langinfo() failed #endif // HAVE_LANGINFO_H { // if we can't get at the character set directly, try to see if it's in @@ -2342,16 +2356,15 @@ wxFontEncoding wxLocale::GetSystemEncoding() #endif return wxMacGetFontEncFromSystemEnc( encoding ) ; #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP - wxString encname = GetSystemEncodingName(); + const wxString encname = GetSystemEncodingName(); if ( !encname.empty() ) { - wxFontEncoding enc = (wxFontMapperBase::Get())-> - CharsetToEncoding(encname, false /* not interactive */); + wxFontEncoding enc = wxFontMapperBase::GetEncodingFromName(encname); // on some modern Linux systems (RedHat 8) the default system locale // is UTF8 -- but it isn't supported by wxGTK in ANSI build at all so // don't even try to use it in this case -#if !wxUSE_UNICODE +#if !wxUSE_UNICODE && defined(__WXGTK__) if ( enc == wxFONTENCODING_UTF8 ) { // the most similar supported encoding... @@ -2359,13 +2372,11 @@ wxFontEncoding wxLocale::GetSystemEncoding() } #endif // !wxUSE_UNICODE - // this should probably be considered as a bug in CharsetToEncoding(): - // it shouldn't return wxFONTENCODING_DEFAULT at all - but it does it - // for US-ASCII charset - // - // we, OTOH, definitely shouldn't return it as it doesn't make sense at - // all (which encoding is it?) - if ( enc != wxFONTENCODING_DEFAULT ) + // GetEncodingFromName() returns wxFONTENCODING_DEFAULT for C locale + // (a.k.a. US-ASCII) which is arguably a bug but keep it like this for + // backwards compatibility and just take care to not return + // wxFONTENCODING_DEFAULT from here as this surely doesn't make sense + if ( enc != wxFONTENCODING_MAX && enc != wxFONTENCODING_DEFAULT ) { return enc; } @@ -2526,20 +2537,12 @@ const wxChar *wxLocale::GetString(const wxChar *szOrigString, { NoTransErr noTransErr; - if ( szDomain != NULL ) - { - wxLogTrace(_T("i18n"), - _T("string '%s'[%lu] not found in domain '%s' for locale '%s'."), - szOrigString, (unsigned long)n, - szDomain, m_strLocale.c_str()); - - } - else - { - wxLogTrace(_T("i18n"), - _T("string '%s'[%lu] not found in locale '%s'."), - szOrigString, (unsigned long)n, m_strLocale.c_str()); - } + wxLogTrace(TRACE_I18N, + _T("string \"%s\"[%ld] not found in %slocale '%s'."), + szOrigString, (long)n, + szDomain ? wxString::Format(_T("domain '%s' "), szDomain).c_str() + : _T(""), + m_strLocale.c_str()); } #endif // __WXDEBUG__ @@ -3536,7 +3539,7 @@ void wxLocale::InitLanguagesDB() LNG(wxLANGUAGE_ZHUANG, "za" , 0 , 0 , "Zhuang") LNG(wxLANGUAGE_ZULU, "zu" , 0 , 0 , "Zulu") -}; +} #undef LNG // --- --- --- generated code ends here --- --- ---