From 7ae5b6442f59c14e0dd5f258d493e4171d87bc95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= Date: Tue, 6 Dec 2016 16:48:11 +0100 Subject: [PATCH] Search $PREFIX/share/locale for translations on Unix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The changes introduced in ​ea160f0 accidentally omitted this search location, so only wx's own install prefix was searched. This probably went undetected for so long because these two are often, but not always, the same. Fixes #17740. (cherry picked from commit 2c24ee9216d9a41cc2a7b4ec292103eadba14176) --- src/common/translation.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/common/translation.cpp b/src/common/translation.cpp index 3e221e9972..4b7c177cc9 100644 --- a/src/common/translation.cpp +++ b/src/common/translation.cpp @@ -1812,6 +1812,12 @@ wxArrayString GetSearchPrefixes() stdp = wxStandardPaths::Get().GetResourcesDir(); if ( paths.Index(stdp) == wxNOT_FOUND ) paths.Add(stdp); + + #if defined(__UNIX__) && !defined(__WXOSX_COCOA__) && !defined(__WXOSX_IPHONE__) && !defined(__DARWIN__) + stdp = wxStandardPaths::Get().GetInstallPrefix() + "/share/locale"; + if ( paths.Index(stdp) == wxNOT_FOUND ) + paths.Add(stdp); + #endif #endif // wxUSE_STDPATHS // last look in default locations