X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e949b437c2faf2331a0439f8fae0f2ed5b3c4ef..02c6eadbc854eb841b75a57ec28f916abe381d03:/src/common/intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index b34f248d27..69379ff601 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -79,7 +79,7 @@ typedef unsigned char size_t8;
             {
                 // Asserting a sizeof directly causes some compilers to
                 // issue a "using constant in a conditional expression" warning
-                size_t                   intsize = sizeof(int);
+                size_t intsize = sizeof(int);
 
                 wxASSERT_MSG( intsize == 4,
                               "size_t32 is incorrectly defined!" );
@@ -97,7 +97,7 @@ const size_t32 MSGCATALOG_MAGIC    = 0x950412de;
 const size_t32 MSGCATALOG_MAGIC_SW = 0xde120495;
 
 // extension of ".mo" files
-#define MSGCATALOG_EXTENSION  ".mo"
+#define MSGCATALOG_EXTENSION  _T(".mo")
 
 // ----------------------------------------------------------------------------
 // global functions
@@ -178,7 +178,7 @@ private:
 
   const char *StringAtOfs(wxMsgTableEntry *pTable, size_t32 index) const
     { return (const char *)(m_pData + Swap(pTable[index].ofsString)); }
-    
+
   // convert encoding to platform native one, if neccessary
   void ConvertEncoding();
 
@@ -290,14 +290,20 @@ static wxString GetFullSearchPath(const wxChar *lang)
                    << wxPATH_SEP;
     }
 
+    // LC_PATH is a standard env var containing the search path for the .mo
+    // files
+    const wxChar *pszLcPath = wxGetenv("LC_PATH");
+    if ( pszLcPath != NULL )
+        searchPath << GetAllMsgCatalogSubdirs(pszLcPath, lang);
+
     // then take the current directory
     // FIXME it should be the directory of the executable
-    searchPath << GetAllMsgCatalogSubdirs(wxT("."), lang) << wxPATH_SEP;
+    searchPath << GetAllMsgCatalogSubdirs(wxT("."), lang);
 
     // and finally add some standard ones
     searchPath
-        << GetAllMsgCatalogSubdirs(wxT("/usr/share/locale"), lang) << wxPATH_SEP
-        << GetAllMsgCatalogSubdirs(wxT("/usr/lib/locale"), lang) << wxPATH_SEP
+        << GetAllMsgCatalogSubdirs(wxT("/usr/share/locale"), lang)
+        << GetAllMsgCatalogSubdirs(wxT("/usr/lib/locale"), lang)
         << GetAllMsgCatalogSubdirs(wxT("/usr/local/share/locale"), lang);
 
     return searchPath;
@@ -314,14 +320,6 @@ bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName0, bool b
    if(szName.Find(wxT('.')) != -1) // contains a dot
       szName = szName.Left(szName.Find(wxT('.')));
 
-  // 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 )
-      strPath += pszLcPath + wxString(szDirPrefix) + MSG_PATH;
-#endif // 0
-
   wxString searchPath = GetFullSearchPath(szDirPrefix);
   const wxChar *sublocale = wxStrchr(szDirPrefix, wxT('_'));
   if ( sublocale )
@@ -343,7 +341,7 @@ bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName0, bool b
   // (we're using an object because we have several return paths)
 
   NoTransErr noTransErr;
-  wxLogVerbose(wxT("looking for catalog '%s' in path '%s'."),
+  wxLogVerbose(_("looking for catalog '%s' in path '%s'."),
                szName.c_str(), searchPath.c_str());
 
   wxString strFullName;
@@ -405,7 +403,8 @@ bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName0, bool b
   m_pszName = new wxChar[wxStrlen(szName) + 1];
   wxStrcpy(m_pszName, szName);
 
-  if (bConvertEncoding) ConvertEncoding();
+  if (bConvertEncoding)
+      ConvertEncoding();
 
   // everything is fine
   return TRUE;
@@ -478,27 +477,33 @@ void wxMsgCatalog::ConvertEncoding()
     const char *hdr = StringAtOfs(m_pOrigTable, 0);
     if (hdr == NULL) return; // not supported by this catalog, does not have non-fuzzy header
     if (hdr[0] != 0) return; // ditto
-    
+
     /* we support catalogs with header (msgid "") that is _not_ marked as "#, fuzzy" (otherwise
        the string would not be included into compiled catalog) */
     wxString header(StringAtOfs(m_pTransTable, 0));
     wxString charset;
-    int pos = header.Find("Content-Type: text/plain; charset=");
-    if (pos == -1) return; // incorrectly filled Content-Type header
-    pos += 34 ; /*strlen("Content-Type: text/plain; charset=")*/
-    while (header[pos] != '\n') charset << header[pos++];
-    
-    if ((enc = wxTheFontMapper -> CharsetToEncoding(charset, FALSE)) == wxFONTENCODING_SYSTEM) return;
+    int pos = header.Find(wxT("Content-Type: text/plain; charset="));
+    if (pos == wxNOT_FOUND)
+        return; // incorrectly filled Content-Type header
+    size_t n = pos + 34; /*strlen("Content-Type: text/plain; charset=")*/
+    while (header[n] != wxT('\n'))
+        charset << header[n++];
+
+    enc = wxTheFontMapper->CharsetToEncoding(charset, FALSE);
+    if ( enc == wxFONTENCODING_SYSTEM )
+        return; // unknown encoding
 
     wxFontEncodingArray a = wxEncodingConverter::GetPlatformEquivalents(enc);
-    if (a[0] == enc) return; // no conversion needed, locale uses native encoding
-    
-    if (a.GetCount() == 0) return; // we don't know common equiv. under this platform
-    
+    if (a[0] == enc)
+        return; // no conversion needed, locale uses native encoding
+
+    if (a.GetCount() == 0)
+        return; // we don't know common equiv. under this platform
+
     wxEncodingConverter converter;
-    
+
     converter.Init(enc, a[0]);
-    for (unsigned i = 0; i < m_numStrings; i++)
+    for (size_t i = 0; i < m_numStrings; i++)
         converter.Convert((char*)StringAtOfs(m_pTransTable, i));
 #endif
 }