Committing in .

[wxWidgets.git] / src / common / intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 5571f62634bff0024b7c08d3543fdb0e43681f9d..117271939001bed827cfd47d7f726517ef88e64f 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_INTL
+

 // standard headers
 #include  <locale.h>
 #include  <ctype.h>
 // standard headers
 #include  <locale.h>
 #include  <ctype.h>


@@ -38,6 +40,7 @@
 #include "wx/intl.h"
 #include "wx/file.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/file.h"
 #include "wx/log.h"

+#include "wx/debug.h"

 #include "wx/utils.h"
 
 #include <stdlib.h>
 #include "wx/utils.h"
 
 #include <stdlib.h>


@@ -74,7 +77,11 @@ typedef unsigned char size_t8;
         public:
             IntSizeChecker()
             {
         public:
             IntSizeChecker()
             {

-                wxASSERT_MSG( sizeof(int) == 4,
+                // 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;
                               "size_t32 is incorrectly defined!" );
             }
         } intsizechecker;


@@ -260,7 +267,7 @@ static wxString GetAllMsgCatalogSubdirs(const wxChar *prefix,
     // 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
     // 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;
 
                << prefix << wxFILE_SEP_PATH << lang << wxPATH_SEP
                << prefix << wxPATH_SEP;
 


@@ -282,21 +289,30 @@ static wxString GetFullSearchPath(const wxChar *lang)
 
     // then take the current directory
     // FIXME it should be the directory of the executable
 
     // 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
 
     // 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
 
     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?
   // 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 )
 #if 0
   const wxChar *pszLcPath = wxGetenv("LC_PATH");
   if ( pszLcPath != NULL )


@@ -304,7 +320,7 @@ bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName)
 #endif // 0
 
   wxString searchPath = GetFullSearchPath(szDirPrefix);
 #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
   if ( sublocale )
   {
       // also add just base locale name: for things like "fr_BE" (belgium


@@ -322,20 +338,20 @@ bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName)
   // not yet be loaded (and it's normal)
   //
   // (we're using an object because we have several return paths)
   // 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) ) {
 
   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'."),
     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() )
 
   wxFile fileMsg(strFullName);
   if ( !fileMsg.IsOpened() )


@@ -407,7 +423,7 @@ const char *wxMsgCatalog::GetString(const char *szOrig) const
       if ( nStr == 0 )
         return NULL;
 
       if ( nStr == 0 )
         return NULL;
 

-      if ( strcmp(szOrig, StringAtOfs(m_pOrigTable, nStr - 1)) == 0 )
+      if ( wxStrcmp(szOrig, StringAtOfs(m_pOrigTable, nStr - 1)) == 0 )

         return StringAtOfs(m_pTransTable, nStr - 1);
 
       if ( nIndex >= m_nHashSize - nIncr)
         return StringAtOfs(m_pTransTable, nStr - 1);
 
       if ( nIndex >= m_nHashSize - nIncr)


@@ -422,7 +438,7 @@ const char *wxMsgCatalog::GetString(const char *szOrig) const
            current;
     while ( bottom < top ) {
       current = (bottom + top) / 2;
            current;
     while ( bottom < top ) {
       current = (bottom + top) / 2;

-      int res = strcmp(szOrig, StringAtOfs(m_pOrigTable, current));
+      int res = wxStrcmp(szOrig, StringAtOfs(m_pOrigTable, current));

       if ( res < 0 )
         top = current;
       else if ( res > 0 )
       if ( res < 0 )
         top = current;
       else if ( res > 0 )


@@ -457,7 +473,10 @@ bool wxLocale::Init(const wxChar *szName,
 
   // change current locale (default: same as long name)
   if ( szLocale == NULL )
 
   // 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_pszOldLocale = wxSetlocale(LC_ALL, szLocale);
   if ( m_pszOldLocale == NULL )
     wxLogError(_("locale '%s' can not be set."), szLocale);


@@ -477,7 +496,7 @@ bool wxLocale::Init(const wxChar *szName,
   m_pMsgCat = NULL;
   bool bOk = TRUE;
   if ( bLoadDefault )
   m_pMsgCat = NULL;
   bool bOk = TRUE;
   if ( bLoadDefault )

-    bOk = AddCatalog(_T("wxstd"));
+    bOk = AddCatalog(wxT("wxstd"));

 
   return bOk;
 }
 
   return bOk;
 }


@@ -509,13 +528,17 @@ wxLocale::~wxLocale()
 
 // get the translation of given string in current locale
 const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
 
 // 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;
 {
   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 ) {
 
   wxMsgCatalog *pMsgCat;
   if ( szDomain != NULL ) {


@@ -562,7 +585,12 @@ const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
     return (wxMB2WXbuf)(szOrigString);
   }
   else
     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
 }
 
 // find catalog by name in a linked list, return NULL if !found


@@ -646,3 +674,6 @@ wxLocale *wxSetLocale(wxLocale *pLocale)
   g_pLocale = pLocale;
   return pOld;
 }
   g_pLocale = pLocale;
   return pOld;
 }

+
+#endif // wxUSE_INTL
+