From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 23 Sep 2006 18:39:28 +0000 (+0000)
Subject: renamed GetMsgCatalogSubdir to *Subdirs to make it clear it may return more than... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b5297239e46874dc58902f34393603f1a12c18fa?ds=sidebyside

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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 4915e52efe..b780f93803 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1017,9 +1017,10 @@ wxMsgCatalogFile::~wxMsgCatalogFile()
     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
-wxString GetMsgCatalogSubdir(const wxChar *prefix, const wxChar *lang)
+wxString GetMsgCatalogSubdirs(const wxChar *prefix, const wxChar *lang)
 {
     wxString searchPath;
     searchPath << prefix << wxFILE_SEP_PATH << lang;
@@ -1045,7 +1046,7 @@ static wxString GetFullSearchPath(const wxChar *lang)
            count = gs_searchPrefixes.size();
     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"));
     if ( pszLcPath )
     {
-        const wxString lcp = GetMsgCatalogSubdir(pszLcPath, lang);
+        const wxString lcp = GetMsgCatalogSubdirs(pszLcPath, lang);
         if ( paths.Index(lcp) == wxNOT_FOUND )
             paths.Add(lcp);
     }
@@ -1074,7 +1075,7 @@ static wxString GetFullSearchPath(const wxChar *lang)
     wxString wxp = wxGetInstallPrefix();
     if ( !wxp.empty() )
     {
-        wxp = GetMsgCatalogSubdir(wxp + _T("/share/locale"), lang);
+        wxp = GetMsgCatalogSubdirs(wxp + _T("/share/locale"), lang);
         if ( paths.Index(wxp) == wxNOT_FOUND )
             paths.Add(wxp);
     }