From: Václav Slavík <vslavik@fastmail.fm>
Date: Wed, 19 Jun 2013 16:02:54 +0000 (+0000)
Subject: Fix GetMsgCatalogSubdirs() to do as documentation says.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d3def4c633be33f44285f64a40c69e08be9161e9

Fix GetMsgCatalogSubdirs() to do as documentation says.

Due to a typo, the prefix/lang path wasn't considered when opening a
domain catalog.

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

diff --git a/src/common/translation.cpp b/src/common/translation.cpp
index 2bf6b2151f..00350928a5 100644
--- a/src/common/translation.cpp
+++ b/src/common/translation.cpp
@@ -1764,13 +1764,13 @@ wxString GetMsgCatalogSubdirs(const wxString& prefix, const wxString& lang)
     //    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 pathPrefix = wxFileName(prefix, lang).GetFullPath();
+    const wxString prefixAndLang = wxFileName(prefix, lang).GetFullPath();
 
     wxString searchPath;
-    searchPath.reserve(4*pathPrefix.length());
-    searchPath << pathPrefix << wxFILE_SEP_PATH << "LC_MESSAGES" << wxPATH_SEP
-            << prefix << wxFILE_SEP_PATH << wxPATH_SEP
-            << pathPrefix;
+    searchPath.reserve(4*prefixAndLang.length());
+    searchPath << prefixAndLang << wxFILE_SEP_PATH << "LC_MESSAGES" << wxPATH_SEP
+               << prefixAndLang << wxPATH_SEP
+               << prefix;
 
     return searchPath;
 }