diff --git a/include/audacity/Types.h b/include/audacity/Types.h index 41117f615..4a19c3db3 100644 --- a/include/audacity/Types.h +++ b/include/audacity/Types.h @@ -387,13 +387,13 @@ public: (const wxString &str, Request request) -> wxString { switch ( request ) { case Request::Context: - return DoGetContext( prevFormatter ); + return TranslatableString::DoGetContext( prevFormatter ); case Request::Format: case Request::DebugFormat: default: { bool debug = request == Request::DebugFormat; return wxString::Format( - DoFormat( prevFormatter, str, debug ), + TranslatableString::DoFormat( prevFormatter, str, debug ), TranslatableString::TranslateArgument( args, debug )... ); } @@ -499,14 +499,15 @@ private: (const wxString &str, Request request) -> wxString { switch ( request ) { case Request::Context: - return DoGetContext( prevFormatter ); + return TranslatableString::DoGetContext( prevFormatter ); case Request::Format: case Request::DebugFormat: default: { bool debug = request == Request::DebugFormat; return wxString::Format( - DoChooseFormat( prevFormatter, str, plural, nn, debug ), + TranslatableString::DoChooseFormat( + prevFormatter, str, plural, nn, debug ), TranslatableString::TranslateArgument( args, debug )... ); } diff --git a/src/Internat.cpp b/src/Internat.cpp index b862df3ec..761b0d26a 100644 --- a/src/Internat.cpp +++ b/src/Internat.cpp @@ -356,13 +356,13 @@ TranslatableString &TranslatableString::Join( -> wxString { switch ( request ) { case Request::Context: - return DoGetContext( prevFormatter ); + return TranslatableString::DoGetContext( prevFormatter ); case Request::Format: case Request::DebugFormat: default: { bool debug = request == Request::DebugFormat; return - DoFormat( prevFormatter, str, debug ) + TranslatableString::DoFormat( prevFormatter, str, debug ) + separator + arg.DoFormat( debug ); }