renamed GetMsgCatalogSubdir to *Subdirs to make it clear it may return more than...

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 4915e52efe3c8de0ccab96e3663aa47033f03aac..b780f93803541749b196f106ba32045b2ab91d34 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -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;
     searchPath << prefix << wxFILE_SEP_PATH << 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++ )
     {
            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 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);
     }
         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() )
     {
     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);
     }
         if ( paths.Index(wxp) == wxNOT_FOUND )
             paths.Add(wxp);
     }