#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
// This is a "low-level" class and is used only by wxMsgCatalog
// ----------------------------------------------------------------------------
-WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxString, wxMessagesHash)
+WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxString, wxMessagesHash);
class wxMsgCatalogFile
{
// ----------------------------------------------------------------------------
// the list of the directories to search for message catalog files
-static wxArrayString s_searchPrefixes;
+static wxArrayString gs_searchPrefixes;
// ============================================================================
// implementation
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;
}
// 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;
}
// 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
#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);
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
}
// 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...
projects / wxWidgets.git / blobdiff