X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5297239e46874dc58902f34393603f1a12c18fa..e409b62aaf6b333803027645ecc77de6c92cae2d:/src/common/intl.cpp?ds=sidebyside

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;
 }