Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simpler fix for locale catalogs lookup bug (better one will hopefully follow)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-08-17 22:24:19 +00:00
parent 52127426a1
commit c3ccca4a00
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/intl.cpp
View File

@@ -300,6 +300,15 @@ static wxString GetFullSearchPath(const wxChar *lang)
if ( pszLcPath != NULL ) if ( pszLcPath != NULL )
searchPath << GetAllMsgCatalogSubdirs(pszLcPath, lang); searchPath << GetAllMsgCatalogSubdirs(pszLcPath, lang);
#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);
#endif // __UNIX__
// then take the current directory // then take the current directory
// FIXME it should be the directory of the executable // FIXME it should be the directory of the executable
#ifdef __WXMAC__ #ifdef __WXMAC__
@@ -310,15 +319,6 @@ static wxString GetFullSearchPath(const wxChar *lang)
#else // !Mac #else // !Mac
searchPath << GetAllMsgCatalogSubdirs(wxT("."), lang); searchPath << GetAllMsgCatalogSubdirs(wxT("."), lang);
#ifdef __UNIX__
// and finally add some standard ones
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);
#endif // __UNIX__
#endif // platform #endif // platform
return searchPath; return searchPath;