X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1ac3b56e6b5b7342d69aa3b33744c345edb3d1e..e9c54ec33655bfa9a57eb7955b114621fb940e1f:/src/common/intl.cpp diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 1176aa6ab2..b5bd55ddea 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -300,6 +300,15 @@ static wxString GetFullSearchPath(const wxChar *lang) if ( pszLcPath != NULL ) 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 // FIXME it should be the directory of the executable #ifdef __WXMAC__ @@ -310,15 +319,6 @@ static wxString GetFullSearchPath(const wxChar *lang) #else // !Mac 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 return searchPath;