From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 23 Sep 2006 18:44:23 +0000 (+0000)
Subject: changed the catalogs lookup back to the old behaviour of searching LC_MESSAGES subdir... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/43e995b6e39d41fd8a26f8bb9e6a6ef54bbcd324

changed the catalogs lookup back to the old behaviour of searching LC_MESSAGES subdirectory on all platforms: the change that made this Unix-only (rev.180) silently broke old applications


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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index b780f93803..c0d360ea0f 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1025,13 +1025,18 @@ wxString GetMsgCatalogSubdirs(const wxChar *prefix, const wxChar *lang)
     wxString searchPath;
     searchPath << prefix << wxFILE_SEP_PATH << lang;
 
-    // under Unix, the message catalogs are supposed to go into LC_MESSAGES
-    // subdirectory so look there too
-#ifdef __UNIX__
+    // Under Unix, the message catalogs are supposed to go into LC_MESSAGES
+    // subdirectory so look there too. Note that we do it on all platforms
+    // and not just Unix, because it doesn't cost much to look into one more
+    // directory and doing it this way has two important benefits:
+    // a) we don't break compatibility with wx-2.6 and older by stopping to
+    //    look in a directory where the catalogs used to be and thus silently
+    //    breaking apps after they are recompiled against the latest wx
+    // b) it makes it possible to package app's support files in the same
+    //    way on all target platforms
     const wxString searchPathOrig(searchPath);
     searchPath << wxFILE_SEP_PATH << wxT("LC_MESSAGES")
                << wxPATH_SEP << searchPathOrig;
-#endif // __UNIX__
 
     return searchPath;
 }