// 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:
#if wxUSE_INTL
-// standard headers
+#ifndef WX_PRECOMP
+ #include "wx/dynarray.h"
+ #include "wx/string.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/debug.h"
+ #include "wx/utils.h"
+ #include "wx/app.h"
+#endif // WX_PRECOMP
#ifndef __WXWINCE__
-#include <locale.h>
+ #include <locale.h>
#endif
+// standard headers
#include <ctype.h>
#include <stdlib.h>
#ifdef HAVE_LANGINFO_H
- #include <langinfo.h>
+ #include <langinfo.h>
#endif
-// wxWidgets
-#ifndef WX_PRECOMP
- #include "wx/string.h"
- #include "wx/intl.h"
- #include "wx/log.h"
- #include "wx/debug.h"
- #include "wx/utils.h"
- #include "wx/dynarray.h"
-#endif // WX_PRECOMP
-
#ifdef __WIN32__
#include "wx/msw/private.h"
#elif defined(__UNIX_LIKE__)
#include "wx/encconv.h"
#include "wx/hashmap.h"
#include "wx/ptr_scpd.h"
-#include "wx/app.h"
#include "wx/apptrait.h"
+#include "wx/stdpaths.h"
#if defined(__WXMAC__)
- #include "wx/mac/private.h" // includes mac headers
+ #include "wx/mac/private.h" // includes mac headers
#endif
// ----------------------------------------------------------------------------
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
// ----------------------------------------------------------------------------
wxPluralFormsNodePtr m_plural;
};
-wxDEFINE_SCOPED_PTR_TYPE(wxPluralFormsCalculator);
+wxDEFINE_SCOPED_PTR_TYPE(wxPluralFormsCalculator)
void wxPluralFormsCalculator::init(wxPluralFormsToken::Number nplurals,
wxPluralFormsNode* plural)
wxPluralFormsCalculatorPtr& rPluralFormsCalculator);
// fills the hash with string-translation pairs
- void FillHash(wxMessagesHash& hash, const wxString& msgIdCharset,
+ void FillHash(wxMessagesHash& hash,
+ const wxString& msgIdCharset,
bool convertEncoding) const;
+ // return the charset of the strings in this catalog or empty string if
+ // none/unknown
+ wxString GetCharset() const { return m_charset; }
+
private:
// this implementation is binary compatible with GNU gettext() version 0.10
wxMsgTableEntry *m_pOrigTable, // pointer to original strings
*m_pTransTable; // translated
- wxString m_charset;
+ wxString m_charset; // from the message catalog header
+
// swap the 2 halves of 32 bit integer if needed
size_t32 Swap(size_t32 ui) const
class wxMsgCatalog
{
public:
+ wxMsgCatalog() { m_conv = NULL; }
+ ~wxMsgCatalog();
+
// load the catalog from disk (szDirPrefix corresponds to language)
bool Load(const wxChar *szDirPrefix, const wxChar *szName,
const wxChar *msgIdCharset = NULL, bool bConvertEncoding = false);
private:
wxMessagesHash m_messages; // all messages in the catalog
wxString m_name; // name of the domain
+
+ // the conversion corresponding to this catalog charset if we installed it
+ // as the global one
+ wxCSConv *m_conv;
+
wxPluralFormsCalculatorPtr m_pluralFormsCalculator;
};
// ----------------------------------------------------------------------------
// the list of the directories to search for message catalog files
-static wxArrayString s_searchPrefixes;
+static wxArrayString gs_searchPrefixes;
// ============================================================================
// implementation
wxMsgCatalogFile::~wxMsgCatalogFile()
{
- wxDELETEA(m_pData);
+ delete [] m_pData;
}
-// return all directories to search for given prefix
-static wxString GetAllMsgCatalogSubdirs(const wxChar *prefix,
- const wxChar *lang)
+// return the directory to search for message catalogs under the given prefix
+static
+wxString GetMsgCatalogSubdir(const wxChar *prefix, const wxChar *lang)
{
wxString searchPath;
+ searchPath << prefix << wxFILE_SEP_PATH << lang;
- // search first in prefix/fr/LC_MESSAGES, then in prefix/fr and finally in
- // prefix (assuming the language is 'fr')
- searchPath << prefix << wxFILE_SEP_PATH << lang << wxFILE_SEP_PATH
- << wxT("LC_MESSAGES") << wxPATH_SEP
- << prefix << wxFILE_SEP_PATH << lang << wxPATH_SEP
- << prefix << wxPATH_SEP;
+ // under Unix, the message catalogs are supposed to go into LC_MESSAGES
+ // subdirectory so look there too
+#ifdef __UNIX__
+ const wxString searchPathOrig(searchPath);
+ searchPath << wxFILE_SEP_PATH << wxT("LC_MESSAGES")
+ << wxPATH_SEP << searchPathOrig;
+#endif // __UNIX__
return searchPath;
}
// construct the search path for the given language
static wxString GetFullSearchPath(const wxChar *lang)
{
- wxString searchPath;
-
// first take the entries explicitly added by the program
- size_t count = s_searchPrefixes.Count();
- for ( size_t n = 0; n < count; n++ )
+ wxArrayString paths;
+ paths.reserve(gs_searchPrefixes.size() + 1);
+ size_t n,
+ count = gs_searchPrefixes.size();
+ for ( n = 0; n < count; n++ )
{
- searchPath << GetAllMsgCatalogSubdirs(s_searchPrefixes[n], lang)
- << wxPATH_SEP;
+ paths.Add(GetMsgCatalogSubdir(gs_searchPrefixes[n], lang));
}
- // TODO: use wxStandardPaths instead of all this mess!!
+#if wxUSE_STDPATHS
+ // then look in the standard location
+ const wxString stdp = wxStandardPaths::Get().
+ GetLocalizedResourcesDir(lang, wxStandardPaths::ResourceCat_Messages);
+
+ if ( paths.Index(stdp) == wxNOT_FOUND )
+ paths.Add(stdp);
+#endif // wxUSE_STDPATHS
+
+ // last look in default locations
+#ifdef __UNIX__
// LC_PATH is a standard env var containing the search path for the .mo
// files
-#ifndef __WXWINCE__
const wxChar *pszLcPath = wxGetenv(wxT("LC_PATH"));
- if ( pszLcPath != NULL )
- searchPath << GetAllMsgCatalogSubdirs(pszLcPath, lang);
-#endif
+ if ( pszLcPath )
+ {
+ const wxString lcp = GetMsgCatalogSubdir(pszLcPath, lang);
+ if ( paths.Index(lcp) == wxNOT_FOUND )
+ paths.Add(lcp);
+ }
-#ifdef __UNIX__
- // add some standard ones and the one in the tree where wxWin was installed:
- searchPath
- << GetAllMsgCatalogSubdirs(wxString(wxGetInstallPrefix()) + wxT("/share/locale"), lang)
- << GetAllMsgCatalogSubdirs(wxT("/usr/share/locale"), lang)
- << GetAllMsgCatalogSubdirs(wxT("/usr/lib/locale"), lang)
- << GetAllMsgCatalogSubdirs(wxT("/usr/local/share/locale"), lang);
+ // also add the one from where wxWin was installed:
+ wxString wxp = wxGetInstallPrefix();
+ if ( !wxp.empty() )
+ {
+ wxp = GetMsgCatalogSubdir(wxp + _T("/share/locale"), lang);
+ if ( paths.Index(wxp) == wxNOT_FOUND )
+ paths.Add(wxp);
+ }
#endif // __UNIX__
- // then take the current directory
- // FIXME it should be the directory of the executable
-#if defined(__WXMAC__)
- searchPath << GetAllMsgCatalogSubdirs(wxGetCwd(), lang);
- // generic search paths could be somewhere in the system folder preferences
-#elif defined(__WXMSW__)
- // look in the directory of the executable
- wxString path;
- wxSplitPath(wxGetFullModuleName(), &path, NULL, NULL);
- searchPath << GetAllMsgCatalogSubdirs(path, lang);
-#else // !Mac, !MSW
- searchPath << GetAllMsgCatalogSubdirs(wxT("."), lang);
-#endif // platform
+
+ // finally construct the full search path
+ wxString searchPath;
+ searchPath.reserve(500);
+ count = paths.size();
+ for ( n = 0; n < count; n++ )
+ {
+ searchPath += paths[n];
+ if ( n != count - 1 )
+ searchPath += wxPATH_SEP;
+ }
return searchPath;
}
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 )
{
// 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 << GetFullSearchPath(wxString(szDirPrefix).
- Left((size_t)(sublocale - szDirPrefix)))
- << wxPATH_SEP;
+ searchPath << wxPATH_SEP
+ << GetFullSearchPath(wxString(szDirPrefix).
+ Left((size_t)(sublocale - szDirPrefix)));
}
// don't give translation errors here because the wxstd catalog might
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 + size_t(0), _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;
}
}
else
{
- wxLogVerbose(_("Cannot parse Plural-Forms:'%s'"),
- pfs.c_str());
+ wxLogVerbose(_("Cannot parse Plural-Forms:'%s'"), pfs.c_str());
}
}
}
const wxString& msgIdCharset,
bool convertEncoding) const
{
-#if wxUSE_WCHAR_T
- wxCSConv *csConv = NULL;
- if ( !m_charset.empty() )
- csConv = new wxCSConv(m_charset);
+#if wxUSE_UNICODE
+ // this parameter doesn't make sense, we always must convert encoding in
+ // Unicode build
+ convertEncoding = true;
+#elif wxUSE_FONTMAP
+ if ( convertEncoding )
+ {
+ // determine if we need any conversion at all
+ wxFontEncoding encCat = wxFontMapperBase::GetEncodingFromName(m_charset);
+ if ( encCat == wxLocale::GetSystemEncoding() )
+ {
+ // no need to convert
+ convertEncoding = false;
+ }
+ }
+#endif // wxUSE_UNICODE/wxUSE_FONTMAP
- wxMBConv& inputConv = csConv ? *((wxMBConv*)csConv) : *wxConvCurrent;
+#if wxUSE_WCHAR_T
+ // conversion to use to convert catalog strings to the GUI encoding
+ wxMBConv *inputConv,
+ *inputConvPtr = NULL; // same as inputConv but safely deleteable
+ if ( convertEncoding && !m_charset.empty() )
+ {
+ inputConvPtr =
+ inputConv = new wxCSConv(m_charset);
+ }
+ else // no need or not possible to convert the encoding
+ {
+#if wxUSE_UNICODE
+ // we must somehow convert the narrow strings in the message catalog to
+ // wide strings, so use the default conversion if we have no charset
+ inputConv = wxConvCurrent;
+#else // !wxUSE_UNICODE
+ inputConv = NULL;
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
+ }
- 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,
#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
(void)convertEncoding; // get rid of warnings about unused parameter
- for (size_t i = 0; i < m_numStrings; i++)
+ for (size_t32 i = 0; i < m_numStrings; i++)
{
const char *data = StringAtOfs(m_pOrigTable, i);
-#if wxUSE_UNICODE
- wxString msgid(data, inputConv);
-#else
+
wxString msgid;
-#if wxUSE_WCHAR_T
- if ( convertEncoding && sourceConv )
- msgid = wxString(inputConv.cMB2WC(data), *sourceConv);
- else
-#endif
- msgid = data;
+#if wxUSE_UNICODE
+ msgid = wxString(data, *inputConv);
+#else // ASCII
+ #if wxUSE_WCHAR_T
+ if ( inputConv && sourceConv )
+ msgid = wxString(inputConv->cMB2WC(data), *sourceConv);
+ else
+ #endif
+ msgid = data;
#endif // wxUSE_UNICODE
data = StringAtOfs(m_pTransTable, i);
size_t index = 0;
while (offset < length)
{
+ const char * const str = data + offset;
+
wxString msgstr;
-#if wxUSE_WCHAR_T
- #if wxUSE_UNICODE
- msgstr = wxString(data + offset, inputConv);
- #else
- if ( convertEncoding )
- msgstr = wxString(inputConv.cMB2WC(data + offset), wxConvLocal);
+#if wxUSE_UNICODE
+ msgstr = wxString(str, *inputConv);
+#elif wxUSE_WCHAR_T
+ if ( inputConv )
+ msgstr = wxString(inputConv->cMB2WC(str), *wxConvUI);
else
- msgstr = wxString(data + offset);
- #endif
+ msgstr = str;
#else // !wxUSE_WCHAR_T
#if wxUSE_FONTMAP
if ( convertEncoding )
- msgstr = wxString(converter.Convert(data + offset));
+ msgstr = wxString(converter.Convert(str));
else
#endif
- msgstr = wxString(data + offset);
+ msgstr = str;
#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
if ( !msgstr.empty() )
{
hash[index == 0 ? msgid : msgid + wxChar(index)] = msgstr;
}
- offset += strlen(data + offset) + 1;
+
+ // skip this string
+ offset += strlen(str) + 1;
++index;
}
}
#if wxUSE_WCHAR_T
delete sourceConv;
- delete csConv;
-#endif
+ delete inputConvPtr;
+#endif // wxUSE_WCHAR_T
}
// wxMsgCatalog class
// ----------------------------------------------------------------------------
+wxMsgCatalog::~wxMsgCatalog()
+{
+ if ( m_conv )
+ {
+ if ( wxConvUI == m_conv )
+ {
+ // we only change wxConvUI if it points to wxConvLocal so we reset
+ // it back to it too
+ wxConvUI = &wxConvLocal;
+ }
+
+ delete m_conv;
+ }
+}
+
bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName,
const wxChar *msgIdCharset, bool bConvertEncoding)
{
m_name = szName;
- if ( file.Load(szDirPrefix, szName, m_pluralFormsCalculator) )
+ if ( !file.Load(szDirPrefix, szName, m_pluralFormsCalculator) )
+ return false;
+
+ file.FillHash(m_messages, msgIdCharset, bConvertEncoding);
+
+ // we should use a conversion compatible with the message catalog encoding
+ // in the GUI if we don't convert the strings to the current conversion but
+ // as the encoding is global, only change it once, otherwise we could get
+ // into trouble if we use several message catalogs with different encodings
+ //
+ // this is, of course, a hack but it at least allows the program to use
+ // message catalogs in any encodings without asking the user to change his
+ // locale
+ if ( !bConvertEncoding &&
+ !file.GetCharset().empty() &&
+ wxConvUI == &wxConvLocal )
{
- file.FillHash(m_messages, msgIdCharset, bConvertEncoding);
- return true;
+ wxConvUI =
+ m_conv = new wxCSConv(file.GetCharset());
}
- return false;
+ return true;
}
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;
wxString locale;
// Set the locale:
-#if defined(__UNIX__) && !defined(__WXMAC__)
- if (language == wxLANGUAGE_DEFAULT)
- locale = wxEmptyString;
- else
+#if defined(__OS2__)
+ wxMB2WXbuf retloc = wxSetlocale(LC_ALL , wxEmptyString);
+#elif defined(__UNIX__) && !defined(__WXMAC__)
+ if (language != wxLANGUAGE_DEFAULT)
locale = info->CanonicalName;
wxMB2WXbuf retloc = wxSetlocaleTryUTF(LC_ALL, locale);
+ const wxString langOnly = locale.Left(2);
if ( !retloc )
{
// Some C libraries don't like xx_YY form and require xx only
- retloc = wxSetlocaleTryUTF(LC_ALL, locale.Mid(0,2));
+ retloc = wxSetlocaleTryUTF(LC_ALL, langOnly);
}
+
+#if wxUSE_FONTMAP
+ // some systems (e.g. FreeBSD and HP-UX) don't have xx_YY aliases but
+ // require the full xx_YY.encoding form, so try using UTF-8 because this is
+ // the only thing we can do generically
+ //
+ // TODO: add encodings applicable to each language to the lang DB and try
+ // them all in turn here
if ( !retloc )
{
- // Some C libraries (namely glibc) still use old ISO 639,
- // so will translate the abbrev for them
- wxString mid = locale.Mid(0,2);
- if (mid == wxT("he"))
- locale = wxT("iw") + locale.Mid(3);
- else if (mid == wxT("id"))
- locale = wxT("in") + locale.Mid(3);
- else if (mid == wxT("yi"))
- locale = wxT("ji") + locale.Mid(3);
- else if (mid == wxT("nb"))
- locale = wxT("no_NO");
- else if (mid == wxT("nn"))
- locale = wxT("no_NY");
-
- retloc = wxSetlocaleTryUTF(LC_ALL, locale);
+ const wxChar **names =
+ wxFontMapperBase::GetAllEncodingNames(wxFONTENCODING_UTF8);
+ while ( *names )
+ {
+ retloc = wxSetlocale(LC_ALL, locale + _T('.') + *names++);
+ if ( retloc )
+ break;
+ }
}
+#endif // wxUSE_FONTMAP
+
if ( !retloc )
{
- // (This time, we changed locale in previous if-branch, so try again.)
- // Some C libraries don't like xx_YY form and require xx only
- retloc = wxSetlocaleTryUTF(LC_ALL, locale.Mid(0,2));
+ // Some C libraries (namely glibc) still use old ISO 639,
+ // so will translate the abbrev for them
+ wxString localeAlt;
+ if ( langOnly == wxT("he") )
+ localeAlt = wxT("iw") + locale.Mid(3);
+ else if ( langOnly == wxT("id") )
+ localeAlt = wxT("in") + locale.Mid(3);
+ else if ( langOnly == wxT("yi") )
+ localeAlt = wxT("ji") + locale.Mid(3);
+ else if ( langOnly == wxT("nb") )
+ localeAlt = wxT("no_NO");
+ else if ( langOnly == wxT("nn") )
+ localeAlt = wxT("no_NY");
+
+ if ( !localeAlt.empty() )
+ {
+ retloc = wxSetlocaleTryUTF(LC_ALL, localeAlt);
+ if ( !retloc )
+ retloc = wxSetlocaleTryUTF(LC_ALL, locale.Left(2));
+ }
}
+
if ( !retloc )
{
wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
return false;
}
+
+#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__
+
#elif defined(__WIN32__)
#if wxUSE_UNICODE && (defined(__VISUALC__) || defined(__MINGW32__))
wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
return false;
}
-#elif defined(__WXPM__)
- wxMB2WXbuf retloc = wxSetlocale(LC_ALL , wxEmptyString);
#else
+ wxUnusedVar(flags);
return false;
#define WX_NO_LOCALE_SUPPORT
#endif
#ifndef WX_NO_LOCALE_SUPPORT
wxChar *szLocale = retloc ? wxStrdup(retloc) : NULL;
- bool ret = Init(name, canonical, retloc,
+ bool ret = Init(name, canonical, szLocale,
(flags & wxLOCALE_LOAD_DEFAULT) != 0,
(flags & wxLOCALE_CONV_ENCODING) != 0);
free(szLocale);
m_language = lang;
return ret;
-#endif
+#endif // !WX_NO_LOCALE_SUPPORT
}
void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
{
- if ( s_searchPrefixes.Index(prefix) == wxNOT_FOUND )
+ if ( gs_searchPrefixes.Index(prefix) == wxNOT_FOUND )
{
- s_searchPrefixes.Add(prefix);
+ gs_searchPrefixes.Add(prefix);
}
//else: already have it
}
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
#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__) || defined(__WXMOTIF__))
if ( enc == wxFONTENCODING_UTF8 )
{
// the most similar supported encoding...
}
#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;
}
{
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__
LNG(wxLANGUAGE_ZHUANG, "za" , 0 , 0 , "Zhuang")
LNG(wxLANGUAGE_ZULU, "zu" , 0 , 0 , "Zulu")
-};
+}
#undef LNG
// --- --- --- generated code ends here --- --- ---
#endif // wxUSE_INTL
-
projects / wxWidgets.git / blobdiff