look for catalogs with LC_MESSAGES subdirectory and without it under Unix

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index ba154e7ee47220b7e8f4135277fa8c457848b493..2014d6dd84960b9840ea4dbf0121ecb13ecebc34 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1014,11 +1014,12 @@ wxString GetMsgCatalogSubdir(const wxChar *prefix, const wxChar *lang)
     searchPath << prefix << wxFILE_SEP_PATH << lang;
 
     // under Unix, the message catalogs are supposed to go into LC_MESSAGES
-    // subdirectory but there is no such requirement/tradition on the other
-    // systems
+    // subdirectory so look there too
 #ifdef __UNIX__
-    searchPath << wxFILE_SEP_PATH << wxT("LC_MESSAGES");
-#endif
+    const wxString searchPathOrig(searchPath);
+    searchPath << wxFILE_SEP_PATH << wxT("LC_MESSAGES")
+               << wxPATH_SEP << searchPathOrig;
+#endif // __UNIX__
 
     return searchPath;
 }