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

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 1176aa6ab2c1d3c0273939cd3e9f156c3800dc69..b5bd55ddea6ee81ed8ef19d038036a611d813019 100644 (file)
--- 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);
 
     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__
     // 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);
 
 #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;
 #endif // platform
 
     return searchPath;