X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/550343399aa1355469ffed72c8cf84c732dcf98b..e9531db94d220b8471165de39c50f1a8fc4032df:/src/common/intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 8805dbdcb1..2014d6dd84 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -77,6 +77,7 @@
 #include "wx/ptr_scpd.h"
 #include "wx/app.h"
 #include "wx/apptrait.h"
+#include "wx/stdpaths.h"
 
 #if defined(__WXMAC__)
   #include  "wx/mac/private.h"  // includes mac headers
@@ -984,7 +985,7 @@ private:
 // ----------------------------------------------------------------------------
 
 // the list of the directories to search for message catalog files
-static wxArrayString s_searchPrefixes;
+static wxArrayString gs_searchPrefixes;
 
 // ============================================================================
 // implementation
@@ -1005,18 +1006,20 @@ wxMsgCatalogFile::~wxMsgCatalogFile()
     wxDELETEA(m_pData);
 }
 
-// return all directories to search for given prefix
-static wxString GetAllMsgCatalogSubdirs(const wxChar *prefix,
-                                        const wxChar *lang)
+// return the directory to search for message catalogs under the given prefix
+static
+wxString GetMsgCatalogSubdir(const wxChar *prefix, const wxChar *lang)
 {
     wxString searchPath;
+    searchPath << prefix << wxFILE_SEP_PATH << lang;
 
-    // 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
-                         << wxT("LC_MESSAGES") << wxPATH_SEP
-               << prefix << wxFILE_SEP_PATH << lang << wxPATH_SEP
-               << prefix << wxPATH_SEP;
+    // under Unix, the message catalogs are supposed to go into LC_MESSAGES
+    // subdirectory so look there too
+#ifdef __UNIX__
+    const wxString searchPathOrig(searchPath);
+    searchPath << wxFILE_SEP_PATH << wxT("LC_MESSAGES")
+               << wxPATH_SEP << searchPathOrig;
+#endif // __UNIX__
 
     return searchPath;
 }
@@ -1024,48 +1027,59 @@ static wxString GetAllMsgCatalogSubdirs(const wxChar *prefix,
 // construct the search path for the given language
 static wxString GetFullSearchPath(const wxChar *lang)
 {
-    wxString searchPath;
-
     // first take the entries explicitly added by the program
-    size_t count = s_searchPrefixes.Count();
-    for ( size_t n = 0; n < count; n++ )
+    wxArrayString paths;
+    paths.reserve(gs_searchPrefixes.size() + 1);
+    size_t n,
+           count = gs_searchPrefixes.size();
+    for ( n = 0; n < count; n++ )
     {
-        searchPath << GetAllMsgCatalogSubdirs(s_searchPrefixes[n], lang)
-                   << wxPATH_SEP;
+        paths.Add(GetMsgCatalogSubdir(gs_searchPrefixes[n], lang));
     }
 
-    // TODO: use wxStandardPaths instead of all this mess!!
 
+#if wxUSE_STDPATHS
+    // then look in the standard location
+    const wxString stdp = wxStandardPaths::Get().
+        GetLocalizedResourcesDir(lang, wxStandardPaths::ResourceCat_Messages);
+
+    if ( paths.Index(stdp) == wxNOT_FOUND )
+        paths.Add(stdp);
+#endif // wxUSE_STDPATHS
+
+    // last look in default locations
+#ifdef __UNIX__
     // LC_PATH is a standard env var containing the search path for the .mo
     // files
-#ifndef __WXWINCE__
     const wxChar *pszLcPath = wxGetenv(wxT("LC_PATH"));
-    if ( pszLcPath != NULL )
-        searchPath << GetAllMsgCatalogSubdirs(pszLcPath, lang);
-#endif
+    if ( pszLcPath )
+    {
+        const wxString lcp = GetMsgCatalogSubdir(pszLcPath, lang);
+        if ( paths.Index(lcp) == wxNOT_FOUND )
+            paths.Add(lcp);
+    }
 
-#ifdef __UNIX__
-    // add some standard ones and the one in the tree where wxWin was installed:
-    searchPath
-        << GetAllMsgCatalogSubdirs(wxString(wxGetInstallPrefix()) + wxT("/share/locale"), lang)
-        << GetAllMsgCatalogSubdirs(wxT("/usr/share/locale"), lang)
-        << GetAllMsgCatalogSubdirs(wxT("/usr/lib/locale"), lang)
-        << GetAllMsgCatalogSubdirs(wxT("/usr/local/share/locale"), lang);
+    // also add the one from where wxWin was installed:
+    wxString wxp = wxGetInstallPrefix();
+    if ( !wxp.empty() )
+    {
+        wxp = GetMsgCatalogSubdir(wxp + _T("/share/locale"), lang);
+        if ( paths.Index(wxp) == wxNOT_FOUND )
+            paths.Add(wxp);
+    }
 #endif // __UNIX__
 
-    // then take the current directory
-    // FIXME it should be the directory of the executable
-#if defined(__WXMAC__)
-    searchPath << GetAllMsgCatalogSubdirs(wxGetCwd(), lang);
-    // generic search paths could be somewhere in the system folder preferences
-#elif defined(__WXMSW__)
-    // look in the directory of the executable
-    wxString path;
-    wxSplitPath(wxGetFullModuleName(), &path, NULL, NULL);
-    searchPath << GetAllMsgCatalogSubdirs(path, lang);
-#else // !Mac, !MSW
-    searchPath << GetAllMsgCatalogSubdirs(wxT("."), lang);
-#endif // platform
+
+    // finally construct the full search path
+    wxString searchPath;
+    searchPath.reserve(500);
+    count = paths.size();
+    for ( n = 0; n < count; n++ )
+    {
+        searchPath += paths[n];
+        if ( n != count - 1 )
+            searchPath += wxPATH_SEP;
+    }
 
     return searchPath;
 }
@@ -1098,9 +1112,9 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName,
       // also add just base locale name: for things like "fr_BE" (belgium
       // french) we should use "fr" if no belgium specific message catalogs
       // exist
-      searchPath << GetFullSearchPath(wxString(szDirPrefix).
-                                      Left((size_t)(sublocale - szDirPrefix)))
-                 << wxPATH_SEP;
+      searchPath << wxPATH_SEP
+                 << GetFullSearchPath(wxString(szDirPrefix).
+                                      Left((size_t)(sublocale - szDirPrefix)));
   }
 
   // don't give translation errors here because the wxstd catalog might
@@ -1137,7 +1151,7 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName,
     return false;
 
   size_t nSize = wx_truncate_cast(size_t, lenFile);
-  wxASSERT_MSG( nSize == lenFile, _T("message catalog bigger than 4GB?") );
+  wxASSERT_MSG( nSize == lenFile + size_t(0), _T("message catalog bigger than 4GB?") );
 
   // read the whole file in memory
   m_pData = new size_t8[nSize];
@@ -1317,7 +1331,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
 #endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
     (void)convertEncoding; // get rid of warnings about unused parameter
 
-    for (size_t i = 0; i < m_numStrings; i++)
+    for (size_t32 i = 0; i < m_numStrings; i++)
     {
         const char *data = StringAtOfs(m_pOrigTable, i);
 #if wxUSE_UNICODE
@@ -1603,59 +1617,80 @@ bool wxLocale::Init(int language, int flags)
 #if defined(__OS2__)
     wxMB2WXbuf retloc = wxSetlocale(LC_ALL , wxEmptyString);
 #elif defined(__UNIX__) && !defined(__WXMAC__)
-    if (language == wxLANGUAGE_DEFAULT)
-        locale = wxEmptyString;
-    else
+    if (language != wxLANGUAGE_DEFAULT)
         locale = info->CanonicalName;
 
     wxMB2WXbuf retloc = wxSetlocaleTryUTF(LC_ALL, locale);
 
-#ifdef __AIX__
-    // at least in AIX 5.2 libc is buggy and the string returned from setlocale(LC_ALL)
-    // can't be passed back to it because it returns 6 strings (one for each locale
-    // category), i.e. for C locale we get back "C C C C C C"
-    //
-    // this contradicts IBM own docs but this is not of much help, so just work around
-    // it in the crudest possible manner
-    wxChar *p = wxStrchr((wxChar *)retloc, _T(' '));
-    if ( p )
-        *p = _T('\0');
-#endif // __AIX__
-
+    const wxString langOnly = locale.Left(2);
     if ( !retloc )
     {
         // Some C libraries don't like xx_YY form and require xx only
-        retloc = wxSetlocaleTryUTF(LC_ALL, locale.Mid(0,2));
+        retloc = wxSetlocaleTryUTF(LC_ALL, langOnly);
     }
+
+#if wxUSE_FONTMAP
+    // some systems (e.g. FreeBSD and HP-UX) don't have xx_YY aliases but
+    // require the full xx_YY.encoding form, so try using UTF-8 because this is
+    // the only thing we can do generically
+    //
+    // TODO: add encodings applicable to each language to the lang DB and try
+    //       them all in turn here
     if ( !retloc )
     {
-        // Some C libraries (namely glibc) still use old ISO 639,
-        // so will translate the abbrev for them
-        wxString mid = locale.Mid(0,2);
-        if (mid == wxT("he"))
-            locale = wxT("iw") + locale.Mid(3);
-        else if (mid == wxT("id"))
-            locale = wxT("in") + locale.Mid(3);
-        else if (mid == wxT("yi"))
-            locale = wxT("ji") + locale.Mid(3);
-        else if (mid == wxT("nb"))
-            locale = wxT("no_NO");
-        else if (mid == wxT("nn"))
-            locale = wxT("no_NY");
-
-        retloc = wxSetlocaleTryUTF(LC_ALL, locale);
+        const wxChar **names =
+            wxFontMapperBase::GetAllEncodingNames(wxFONTENCODING_UTF8);
+        while ( *names )
+        {
+            retloc = wxSetlocale(LC_ALL, locale + _T('.') + *names++);
+            if ( retloc )
+                break;
+        }
     }
+#endif // wxUSE_FONTMAP
+
     if ( !retloc )
     {
-        // (This time, we changed locale in previous if-branch, so try again.)
-        // Some C libraries don't like xx_YY form and require xx only
-        retloc = wxSetlocaleTryUTF(LC_ALL, locale.Mid(0,2));
+        // Some C libraries (namely glibc) still use old ISO 639,
+        // so will translate the abbrev for them
+        wxString localeAlt;
+        if ( langOnly == wxT("he") )
+            localeAlt = wxT("iw") + locale.Mid(3);
+        else if ( langOnly == wxT("id") )
+            localeAlt = wxT("in") + locale.Mid(3);
+        else if ( langOnly == wxT("yi") )
+            localeAlt = wxT("ji") + locale.Mid(3);
+        else if ( langOnly == wxT("nb") )
+            localeAlt = wxT("no_NO");
+        else if ( langOnly == wxT("nn") )
+            localeAlt = wxT("no_NY");
+
+        if ( !localeAlt.empty() )
+        {
+            retloc = wxSetlocaleTryUTF(LC_ALL, localeAlt);
+            if ( !retloc )
+                retloc = wxSetlocaleTryUTF(LC_ALL, locale.Left(2));
+        }
     }
+
     if ( !retloc )
     {
         wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
         return false;
     }
+
+#ifdef __AIX__
+    // at least in AIX 5.2 libc is buggy and the string returned from setlocale(LC_ALL)
+    // can't be passed back to it because it returns 6 strings (one for each locale
+    // category), i.e. for C locale we get back "C C C C C C"
+    //
+    // this contradicts IBM own docs but this is not of much help, so just work around
+    // it in the crudest possible manner
+    wxChar *p = wxStrchr((wxChar *)retloc, _T(' '));
+    if ( p )
+        *p = _T('\0');
+#endif // __AIX__
+
 #elif defined(__WIN32__)
 
     #if wxUSE_UNICODE && (defined(__VISUALC__) || defined(__MINGW32__))
@@ -1774,13 +1809,14 @@ bool wxLocale::Init(int language, int flags)
         return false;
     }
 #else
+    wxUnusedVar(flags);
     return false;
     #define WX_NO_LOCALE_SUPPORT
 #endif
 
 #ifndef WX_NO_LOCALE_SUPPORT
     wxChar *szLocale = retloc ? wxStrdup(retloc) : NULL;
-    bool ret = Init(name, canonical, retloc,
+    bool ret = Init(name, canonical, szLocale,
                     (flags & wxLOCALE_LOAD_DEFAULT) != 0,
                     (flags & wxLOCALE_CONV_ENCODING) != 0);
     free(szLocale);
@@ -1789,16 +1825,16 @@ bool wxLocale::Init(int language, int flags)
         m_language = lang;
 
     return ret;
-#endif
+#endif // !WX_NO_LOCALE_SUPPORT
 }
 
 
 
 void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
 {
-    if ( s_searchPrefixes.Index(prefix) == wxNOT_FOUND )
+    if ( gs_searchPrefixes.Index(prefix) == wxNOT_FOUND )
     {
-        s_searchPrefixes.Add(prefix);
+        gs_searchPrefixes.Add(prefix);
     }
     //else: already have it
 }
@@ -2373,7 +2409,7 @@ wxFontEncoding wxLocale::GetSystemEncoding()
         // on some modern Linux systems (RedHat 8) the default system locale
         // is UTF8 -- but it isn't supported by wxGTK in ANSI build at all so
         // don't even try to use it in this case
-#if !wxUSE_UNICODE && defined(__WXGTK__)
+#if !wxUSE_UNICODE && (defined(__WXGTK__) || defined(__WXMOTIF__))
         if ( enc == wxFONTENCODING_UTF8 )
         {
             // the most similar supported encoding...