#pragma hdrstop
#endif
+#if wxUSE_INTL
+
// standard headers
#include <locale.h>
#include <ctype.h>
#include "wx/intl.h"
#include "wx/file.h"
#include "wx/log.h"
+#include "wx/debug.h"
#include "wx/utils.h"
#include <stdlib.h>
// simple types
// ----------------------------------------------------------------------------
-// FIXME adjust if necessary
+// this should *not* be wxChar, this type must have exactly 8 bits!
typedef unsigned char size_t8;
-typedef unsigned long size_t32;
+
+#ifdef __WXMSW__
+ #if defined(__WIN16__)
+ typedef unsigned long size_t32;
+ #elif defined(__WIN32__)
+ typedef unsigned int size_t32;
+ #else
+ // Win64 will have different type sizes
+ #error "Please define a 32 bit type"
+ #endif
+#else // !Windows
+ // SIZEOF_XXX are defined by configure
+ #if defined(SIZEOF_INT) && (SIZEOF_INT == 4)
+ typedef unsigned int size_t32;
+ #elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 4)
+ typedef unsigned long size_t32;
+ #else
+ // assume sizeof(int) == 4 - what else can we do
+ typedef unsigned int size_t32;
+
+ // ... but at least check it during run time
+ static class IntSizeChecker
+ {
+ public:
+ IntSizeChecker()
+ {
+ // Asserting a sizeof directly causes some compilers to
+ // issue a "using constant in a conditional expression" warning
+ size_t intsize = sizeof(int);
+
+ wxASSERT_MSG( intsize == 4,
+ "size_t32 is incorrectly defined!" );
+ }
+ } intsizechecker;
+ #endif
+#endif // Win/!Win
// ----------------------------------------------------------------------------
// constants
// 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
- << _T("LC_MESSAGES") << wxPATH_SEP
+ << wxT("LC_MESSAGES") << wxPATH_SEP
<< prefix << wxFILE_SEP_PATH << lang << wxPATH_SEP
<< prefix << wxPATH_SEP;
// then take the current directory
// FIXME it should be the directory of the executable
- searchPath << GetAllMsgCatalogSubdirs(_T("."), lang) << wxPATH_SEP;
+ searchPath << GetAllMsgCatalogSubdirs(wxT("."), lang) << wxPATH_SEP;
// and finally add some standard ones
searchPath
- << GetAllMsgCatalogSubdirs(_T("/usr/share/locale"), lang) << wxPATH_SEP
- << GetAllMsgCatalogSubdirs(_T("/usr/lib/locale"), lang) << wxPATH_SEP
- << GetAllMsgCatalogSubdirs(_T("/usr/local/share/locale"), lang);
+ << GetAllMsgCatalogSubdirs(wxT("/usr/share/locale"), lang) << wxPATH_SEP
+ << GetAllMsgCatalogSubdirs(wxT("/usr/lib/locale"), lang) << wxPATH_SEP
+ << GetAllMsgCatalogSubdirs(wxT("/usr/local/share/locale"), lang);
return searchPath;
}
// open disk file and read in it's contents
-bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName)
+bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName0)
{
+ /* 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 szName = szName0;
+ if(szName.Find('.') != -1) // contains a dot
+ szName = szName.Left(szName.Find('.'));
+
// FIXME VZ: I forgot the exact meaning of LC_PATH - anyone to remind me?
+ // KB: search path where to find the mo files, probably : delimited
#if 0
const wxChar *pszLcPath = wxGetenv("LC_PATH");
if ( pszLcPath != NULL )
#endif // 0
wxString searchPath = GetFullSearchPath(szDirPrefix);
- const wxChar *sublocale = wxStrchr(szDirPrefix, _T('_'));
+ const wxChar *sublocale = wxStrchr(szDirPrefix, wxT('_'));
if ( sublocale )
{
// also add just base locale name: for things like "fr_BE" (belgium
// not yet be loaded (and it's normal)
//
// (we're using an object because we have several return paths)
- NoTransErr noTransErr;
- wxLogVerbose(_("looking for catalog '%s' in path '%s'."),
- szName, searchPath.c_str());
+ NoTransErr noTransErr;
+ wxLogVerbose(wxT("looking for catalog '%s' in path '%s'."),
+ szName.c_str(), searchPath.c_str());
wxString strFullName;
if ( !wxFindFileInPath(&strFullName, searchPath, strFile) ) {
- wxLogWarning(_("catalog file for domain '%s' not found."), szName);
+ wxLogWarning(_("catalog file for domain '%s' not found."), szName.c_str());
return FALSE;
}
// open file
wxLogVerbose(_("using catalog '%s' from '%s'."),
- szName, strFullName.c_str());
+ szName.c_str(), strFullName.c_str());
wxFile fileMsg(strFullName);
if ( !fileMsg.IsOpened() )
// change current locale (default: same as long name)
if ( szLocale == NULL )
- szLocale = szName;
+ {
+ // the argument to setlocale()
+ szLocale = szShort;
+ }
m_pszOldLocale = wxSetlocale(LC_ALL, szLocale);
if ( m_pszOldLocale == NULL )
wxLogError(_("locale '%s' can not be set."), szLocale);
m_pMsgCat = NULL;
bool bOk = TRUE;
if ( bLoadDefault )
- bOk = AddCatalog(_T("wxstd"));
+ bOk = AddCatalog(wxT("wxstd"));
return bOk;
}
// get the translation of given string in current locale
const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
- const wxChar *szDomain) const
+ const wxChar *szDomain) const
{
if ( wxIsEmpty(szOrigString) )
return szDomain;
const char *pszTrans = NULL;
- const wxWX2MBbuf szOrgString = wxConv_libc.cWX2MB(szOrigString);
+#if wxUSE_UNICODE
+ const wxWX2MBbuf szOrgString = wxConvCurrent->cWX2MB(szOrigString);
+#else // ANSI
+ #define szOrgString szOrigString
+#endif // Unicode/ANSI
wxMsgCatalog *pMsgCat;
if ( szDomain != NULL ) {
return (wxMB2WXbuf)(szOrigString);
}
else
- return (wxMB2WXbuf)(wxConv_libc.cMB2WX(pszTrans));
+ {
+ return wxConvertMB2WX(pszTrans); // or preferably wxCSConv(charset).cMB2WX(pszTrans) or something,
+ // a macro similar to wxConvertMB2WX could be written for that
+ }
+
+ #undef szOrgString
}
// find catalog by name in a linked list, return NULL if !found
g_pLocale = pLocale;
return pOld;
}
+
+#endif // wxUSE_INTL
+