From 078e4e5841954b9e89209d3189ee1931678e4436 Mon Sep 17 00:00:00 2001 From: James Crook Date: Fri, 23 Sep 2016 20:56:04 +0100 Subject: [PATCH] Fix 'effects not found' issue. Caused by details of how translation had been modified. --- src/Audacity.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Audacity.h b/src/Audacity.h index 016ce4223..deb398c87 100644 --- a/src/Audacity.h +++ b/src/Audacity.h @@ -177,13 +177,18 @@ extern const wxString& GetCustomTranslation(const wxString& str1 ); extern const wxString& GetCustomSubstitution(const wxString& str1 ); // Marks strings for extraction only...must use wxGetTranslation() to translate. -#define XO(s) GetCustomSubstitution(s) +#define XO(s) wxT(s) // Marks string for substitution only. -#define _TS( s ) GetCustomSubstitution(s) +#define _TS( s ) GetCustomSubstitution( s ) #define WXINTL_NO_GETTEXT_MACRO -#define _(s) GetCustomTranslation((s)) + +#ifdef _ +#undef _ +#endif + +#define _(s) GetCustomTranslation((s)) #endif // This renames a good use of this C++ keyword that we don't need to review when hunting for leaks.