/////////////////////////////////////////////////////////////////////////////
// ============================================================================
-// declarations
+// declaration
// ============================================================================
// ----------------------------------------------------------------------------
#pragma hdrstop
#endif
-// wxWindows
-#ifndef WX_PRECOMP
- #include "wx/defs.h"
- #include "wx/string.h"
-#endif //WX_PRECOMP
+// standard headers
+#include <locale.h>
+// wxWindows
+#include "wx/defs.h"
+#include "wx/string.h"
#include "wx/intl.h"
#include "wx/file.h"
#include "wx/log.h"
#include "wx/utils.h"
-// standard headers
-#include <locale.h>
#include <stdlib.h>
// ----------------------------------------------------------------------------
#define MSGCATALOG_EXTENSION ".mo"
// ----------------------------------------------------------------------------
-// global functions (private to this module)
+// global functions
// ----------------------------------------------------------------------------
// suppress further error messages about missing translations
// (if you don't have one catalog file, you wouldn't like to see the
// error message for each string in it, so normally it's given only
// once)
-static void wxSuppressTransErrors();
+void wxSuppressTransErrors();
// restore the logging
-static void wxRestoreTransErrors();
+void wxRestoreTransErrors();
// get the current state
-static bool wxIsLoggingTransErrors();
+bool wxIsLoggingTransErrors();
-// get the current locale object (@@ may be NULL!)
-static wxLocale *wxSetLocale(wxLocale *pLocale);
+// get the current locale object (## may be NULL!)
+extern wxLocale *wxSetLocale(wxLocale *pLocale);
// ----------------------------------------------------------------------------
// wxMsgCatalog corresponds to one disk-file message catalog.
wxMsgCatalog::~wxMsgCatalog()
{
- DELETEA(m_pData);
- DELETEA(m_pszName);
+ wxDELETEA(m_pData);
+ wxDELETEA(m_pszName);
}
-// a helper class which suppresses all translation error messages
-// from the moment of it's creation until it's destruction
class NoTransErr
{
public:
// open disk file and read in it's contents
bool wxMsgCatalog::Load(const char *szDirPrefix, const char *szName)
{
- // search order (assume language 'lang') is
- // 1) $LC_PATH/lang/LC_MESSAGES (if LC_PATH set)
- // 2) ./lang/LC_MESSAGES
- // 3) ./lang
+ // search order (assume language 'foo') is
+ // 1) $LC_PATH/foo/LC_MESSAGES (if LC_PATH set)
+ // 2) ./foo/LC_MESSAGES
+ // 3) ./foo
// 4) . (Added by JACS)
//
// under UNIX we search also in:
- // 5) /usr/share/locale/lang/LC_MESSAGES (Linux)
- // 6) /usr/lib/locale/lang/LC_MESSAGES (Solaris)
+ // 5) /usr/share/locale/foo/LC_MESSAGES (Linux)
+ // 6) /usr/lib/locale/foo/LC_MESSAGES (Solaris)
#define MSG_PATH FILE_SEP_PATH + "LC_MESSAGES" PATH_SEP
wxString strPath("");
// NB: '<<' is unneeded between too literal strings:
// they are concatenated at compile time
- strPath << "./" << wxString(szDirPrefix) + MSG_PATH // (2)
- << "./" << szDirPrefix << FILE_SEP_PATH << PATH_SEP // (3)
- << "." << PATH_SEP // (4)
+ strPath += "./" + wxString(szDirPrefix) + MSG_PATH // (2)
+ + "./" + szDirPrefix + FILE_SEP_PATH + PATH_SEP // (3)
+ + "." + PATH_SEP
#ifdef __UNIX__
- "/usr/share/locale/" << szDirPrefix << MSG_PATH // (5)
- "/usr/lib/locale/" << szDirPrefix << MSG_PATH // (6)
+ "/usr/share/locale/" + szDirPrefix + MSG_PATH // (5)
+ "/usr/lib/locale/" + szDirPrefix + MSG_PATH // (6)
#endif //UNIX
;
// (we're using an object because we have several return paths)
NoTransErr noTransErr;
- wxLogVerbose(_("looking for catalog '%s' in path '%s'..."),
- szName, strPath.c_str());
+ wxLogVerbose(_("looking for catalog '%s' in path '%s'."),
+ szName, strPath.c_str());
wxString strFullName;
if ( !wxFindFileInPath(&strFullName, strPath, strFile) ) {
}
// open file
- wxLogVerbose(_("catalog '%s' found in '%s'."), szName, strFullName.c_str());
+ wxLogVerbose(_("using catalog '%s' from '%s'."),
+ szName, strFullName.c_str());
- // declare these vars here because we're using goto further down
- bool bValid;
- off_t nSize;
-
wxFile fileMsg(strFullName);
if ( !fileMsg.IsOpened() )
- goto error;
+ return FALSE;
// get the file size
- nSize = fileMsg.Length();
- if ( nSize == ofsInvalid )
- goto error;
+ off_t nSize = fileMsg.Length();
+ if ( nSize == wxInvalidOffset )
+ return FALSE;
// read the whole file in memory
m_pData = new uint8[nSize];
if ( fileMsg.Read(m_pData, nSize) != nSize ) {
- DELETEA(m_pData);
- m_pData = NULL;
- goto error;
+ wxDELETEA(m_pData);
+ return FALSE;
}
// examine header
- bValid = (size_t)nSize > sizeof(wxMsgCatalogHeader);
+ bool bValid = (size_t)nSize > sizeof(wxMsgCatalogHeader);
wxMsgCatalogHeader *pHeader;
if ( bValid ) {
if ( !bValid ) {
// it's either too short or has incorrect magic number
- wxLogWarning(_("'%s' is not a valid message catalog."),
- strFullName.c_str());
+ wxLogWarning(_("'%s' is not a valid message catalog."), strFullName.c_str());
- DELETEA(m_pData);
- m_pData = NULL;
+ wxDELETEA(m_pData);
return FALSE;
}
// initialize
m_numStrings = Swap(pHeader->numStrings);
- m_pOrigTable = (wxMsgTableEntry *)(m_pData + Swap(pHeader->ofsOrigTable));
- m_pTransTable = (wxMsgTableEntry *)(m_pData + Swap(pHeader->ofsTransTable));
+ m_pOrigTable = (wxMsgTableEntry *)(m_pData +
+ Swap(pHeader->ofsOrigTable));
+ m_pTransTable = (wxMsgTableEntry *)(m_pData +
+ Swap(pHeader->ofsTransTable));
m_nHashSize = Swap(pHeader->nHashSize);
m_pHashTable = (uint32 *)(m_pData + Swap(pHeader->ofsHashTable));
// everything is fine
return TRUE;
-
-error:
- wxLogError(_("error opening message catalog '%s', not loaded."),
- strFullName.c_str());
- return FALSE;
}
// search for a string
// wxLocale
// ----------------------------------------------------------------------------
-// NB: ctor has (desired) side effect of changing current locale
-wxLocale::wxLocale(const char *szName,
- const char *szShort,
- const char *szLocale,
- bool bLoadDefault)
- : m_strLocale(szName), m_strShort(szShort)
+wxLocale::wxLocale()
{
+ m_pszOldLocale = NULL;
+ m_pMsgCat = NULL;
+}
+
+// NB: this function has (desired) side effect of changing current locale
+bool wxLocale::Init(const char *szName,
+ const char *szShort,
+ const char *szLocale,
+ bool bLoadDefault)
+{
+ m_strLocale = szName;
+ m_strShort = szShort;
+
// change current locale (default: same as long name)
if ( szLocale == NULL )
szLocale = szName;
// the short name will be used to look for catalog files as well,
// so we need something here
if ( m_strShort.IsEmpty() ) {
- // @@@@ I don't know how these 2 letter abbreviations are formed,
+ // #### I don't know how these 2 letter abbreviations are formed,
// this wild guess is almost surely wrong
m_strShort = wxToLower(szLocale[0]) + wxToLower(szLocale[1]);
}
// load the default catalog with wxWindows standard messages
m_pMsgCat = NULL;
+ bool bOk = TRUE;
if ( bLoadDefault )
- AddCatalog("wxstd");
+ bOk = AddCatalog("wxstd");
+
+ return bOk;
}
// clean up
wxSuppressTransErrors();
if ( szDomain != NULL )
- wxLogWarning(_("string '%s' not found in domain '%s'"
- " for locale '%s'."),
- szOrigString, szDomain, m_strLocale.c_str());
+ wxLogWarning(_("string '%s' not found in domain '%s' for locale '%s'."),
+ szOrigString, szDomain, m_strLocale.c_str());
else
wxLogWarning(_("string '%s' not found in locale '%s'."),
- szOrigString, m_strLocale.c_str());
+ szOrigString, m_strLocale.c_str());
}
return szOrigString;
// the current locale object
wxLocale *g_pLocale = NULL;
+wxLocale *wxGetLocale()
+{
+ return g_pLocale;
+}
+
wxLocale *wxSetLocale(wxLocale *pLocale)
{
wxLocale *pOld = g_pLocale;
projects / wxWidgets.git / blobdiff