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

renamed GetMsgCatalogSubdir to *Subdirs to make it clear it may return more than one path and documented this in its comment

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-09-23 18:39:28 +00:00
parent 69deca265e
commit b5297239e4
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/intl.cpp
View File

@@ -1017,9 +1017,10 @@ wxMsgCatalogFile::~wxMsgCatalogFile()
delete [] m_pData; delete [] m_pData;
} }
// return the directory to search for message catalogs under the given prefix // return the directories to search for message catalogs under the given
// prefix, separated by wxPATH_SEP
static static
wxString GetMsgCatalogSubdir(const wxChar *prefix, const wxChar *lang) wxString GetMsgCatalogSubdirs(const wxChar *prefix, const wxChar *lang)
{ {
wxString searchPath; wxString searchPath;
searchPath << prefix << wxFILE_SEP_PATH << lang; searchPath << prefix << wxFILE_SEP_PATH << lang;
@@ -1045,7 +1046,7 @@ static wxString GetFullSearchPath(const wxChar *lang)
count = gs_searchPrefixes.size(); count = gs_searchPrefixes.size();
for ( n = 0; n < count; n++ ) for ( n = 0; n < count; n++ )
{ {
paths.Add(GetMsgCatalogSubdir(gs_searchPrefixes[n], lang)); paths.Add(GetMsgCatalogSubdirs(gs_searchPrefixes[n], lang));
} }
@@ -1065,7 +1066,7 @@ static wxString GetFullSearchPath(const wxChar *lang)
const wxChar *pszLcPath = wxGetenv(wxT("LC_PATH")); const wxChar *pszLcPath = wxGetenv(wxT("LC_PATH"));
if ( pszLcPath ) if ( pszLcPath )
{ {
const wxString lcp = GetMsgCatalogSubdir(pszLcPath, lang); const wxString lcp = GetMsgCatalogSubdirs(pszLcPath, lang);
if ( paths.Index(lcp) == wxNOT_FOUND ) if ( paths.Index(lcp) == wxNOT_FOUND )
paths.Add(lcp); paths.Add(lcp);
} }
@@ -1074,7 +1075,7 @@ static wxString GetFullSearchPath(const wxChar *lang)
wxString wxp = wxGetInstallPrefix(); wxString wxp = wxGetInstallPrefix();
if ( !wxp.empty() ) if ( !wxp.empty() )
{ {
wxp = GetMsgCatalogSubdir(wxp + _T("/share/locale"), lang); wxp = GetMsgCatalogSubdirs(wxp + _T("/share/locale"), lang);
if ( paths.Index(wxp) == wxNOT_FOUND ) if ( paths.Index(wxp) == wxNOT_FOUND )
paths.Add(wxp); paths.Add(wxp);
} }