Reverting back to 1.35 as 1.36 does not work with all data sources

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index e21fc7abe3d7fabb587bed2124ce0dc81eb46d6b..81b1ee49428e06b42d250f36f6ee3b6f02a97bc4 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -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();
 
@@ -475,19 +475,36 @@ void wxMsgCatalog::ConvertEncoding()
     wxFontEncoding enc;
 
     // first, find encoding header:
-    const char *hdr = GetString("$ENCODING");   
-    if (hdr == NULL) return; // not supported by this catalog
-    if ((enc = wxTheFontMapper -> CharsetToEncoding(hdr, FALSE)) == wxFONTENCODING_SYSTEM) return;
+    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(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
 }