From c3d846a92541f841d7463b95613f91b8f810eb17 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Thu, 1 Aug 2013 09:58:00 -0700 Subject: [PATCH] Add overloaded translate() that takes CharPointer_UTF8 --- .../text/beast_LocalisedStrings.cpp | 24 ++++--------------- .../beast_core/text/beast_LocalisedStrings.h | 13 ++++++---- 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/Subtrees/beast/modules/beast_core/text/beast_LocalisedStrings.cpp b/Subtrees/beast/modules/beast_core/text/beast_LocalisedStrings.cpp index 95866d491..ca734b478 100644 --- a/Subtrees/beast/modules/beast_core/text/beast_LocalisedStrings.cpp +++ b/Subtrees/beast/modules/beast_core/text/beast_LocalisedStrings.cpp @@ -150,26 +150,12 @@ LocalisedStrings* LocalisedStrings::getCurrentMappings() return currentMappings; } -String LocalisedStrings::translateWithCurrentMappings (const String& text) -{ - return beast::translate (text); -} +String LocalisedStrings::translateWithCurrentMappings (const String& text) { return beast::translate (text); } +String LocalisedStrings::translateWithCurrentMappings (const char* text) { return beast::translate (text); } -String LocalisedStrings::translateWithCurrentMappings (const char* text) -{ - return beast::translate (String (text)); -} - -String translate (const String& text) -{ - return translate (text, text); -} - -String translate (const char* const literal) -{ - const String text (literal); - return translate (text, text); -} +String translate (const String& text) { return beast::translate (text, text); } +String translate (const char* text) { return beast::translate (String (text)); } +String translate (CharPointer_UTF8 text) { return beast::translate (String (text)); } String translate (const String& text, const String& resultIfNotFound) { diff --git a/Subtrees/beast/modules/beast_core/text/beast_LocalisedStrings.h b/Subtrees/beast/modules/beast_core/text/beast_LocalisedStrings.h index c8163b318..4e39c1fe5 100644 --- a/Subtrees/beast/modules/beast_core/text/beast_LocalisedStrings.h +++ b/Subtrees/beast/modules/beast_core/text/beast_LocalisedStrings.h @@ -65,12 +65,12 @@ printSomething (TRANS("hello")); @endcode - This macro is used in the Beast classes themselves, so your application has a chance to - intercept and translate any internal Beast text strings that might be shown. (You can easily - get a list of all the messages by searching for the TRANS() macro in the Beast source + This macro is used in the Juce classes themselves, so your application has a chance to + intercept and translate any internal Juce text strings that might be shown. (You can easily + get a list of all the messages by searching for the TRANS() macro in the Juce source code). */ -class BEAST_API LocalisedStrings : LeakChecked +class BEAST_API LocalisedStrings : LeakChecked { public: //============================================================================== @@ -208,6 +208,11 @@ String translate (const String& stringLiteral); */ String translate (const char* stringLiteral); +/** Uses the LocalisedStrings class to translate the given string literal. + @see LocalisedStrings +*/ +String translate (CharPointer_UTF8 stringLiteral); + /** Uses the LocalisedStrings class to translate the given string literal. @see LocalisedStrings */