Index: doc/contributions.txt =================================================================== --- doc/contributions.txt (revision 2776) +++ doc/contributions.txt (working copy) @@ -481,6 +481,8 @@ CT-352 Renault Clio VWR-1976 +resu Ampan + SNOW-93 Ringo Tuxing CT-225 CT-226 Index: indra/cmake/JsonCpp.cmake =================================================================== --- indra/cmake/JsonCpp.cmake (revision 0) +++ indra/cmake/JsonCpp.cmake (revision 0) @@ -0,0 +1,19 @@ +# -*- cmake -*- + +include(Prebuilt) + +if (STANDALONE) + include(FindJsonCpp) +else (STANDALONE) + use_prebuilt_binary(jsoncpp) + if (WINDOWS) + set(JSONCPP_LIBRARIES + debug json_vc80d + optimized json_vc80) + elseif (DARWIN) + set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt) + elseif (LINUX) + set(JSONCPP_LIBRARIES jsoncpp) + endif (WINDOWS) + set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp) +endif (STANDALONE) Index: indra/llcommon/llchat.h =================================================================== --- indra/llcommon/llchat.h (revision 2776) +++ indra/llcommon/llchat.h (working copy) @@ -79,9 +79,24 @@ mMuted(FALSE), mTime(0.0), mPosAgent(), - mURL() + mURL(), + mLanguage() { } + LLChat(const LLChat &chat) + : mText(chat.mText), + mFromName(chat.mFromName), + mFromID(chat.mFromID), + mSourceType(chat.mSourceType), + mChatType(chat.mChatType), + mAudible(chat.mAudible), + mMuted(chat.mMuted), + mTime(chat.mTime), + mPosAgent(chat.mPosAgent), + mURL(chat.mURL), + mLanguage(chat.mLanguage) + { } + std::string mText; // UTF-8 line of text std::string mFromName; // agent or object name LLUUID mFromID; // agent id or object id @@ -92,6 +107,7 @@ F64 mTime; // viewer only, seconds from viewer start LLVector3 mPosAgent; std::string mURL; + std::string mLanguage; }; #endif Index: indra/newview/llviewermessage.cpp =================================================================== --- indra/newview/llviewermessage.cpp (revision 2776) +++ indra/newview/llviewermessage.cpp (working copy) @@ -135,6 +135,7 @@ #include "llfloaterworldmap.h" #include "llviewerdisplay.h" #include "llkeythrottle.h" +#include "lltranslate.h" #include @@ -2229,7 +2230,87 @@ LLNotifications::instance().add("CallingCardDeclined"); } +class ChatTranslationReceiver : public LLTranslate::TranslationReceiver +{ +public : + ChatTranslationReceiver(const std::string &fromLang, const std::string &toLang, const std::string &mesg, LLChat *chat, + const BOOL history) + : LLTranslate::TranslationReceiver(fromLang, toLang, mesg), + m_chat(chat), + m_history(history) + { + } + static boost::intrusive_ptr build(const std::string &fromLang, const std::string &toLang, const std::string &mesg, LLChat *chat, const BOOL history) + { + return boost::intrusive_ptr(new ChatTranslationReceiver(fromLang, toLang, mesg, chat, history)); + } + +protected: + void handleResponse(const std::string &translation, const std::string &detectedLanguage) + { + m_chat->mText += m_mesg; + + if (m_toLang != detectedLanguage) + m_chat->mText += " (" + translation + ")"; + + add_floater_chat(*m_chat, m_history); + + delete m_chat; + } + + void handleFailure() + { + LLTranslate::TranslationReceiver::handleFailure(); + + m_chat->mText += m_mesg; + + m_chat->mText += " (?)"; + + add_floater_chat(*m_chat, m_history); + + delete m_chat; + } + +private: + LLChat *m_chat; + const BOOL m_history; +}; + +void add_floater_chat(const LLChat &chat, const BOOL history) +{ + if (history) + { + // just add to history + LLFloaterChat::addChatHistory(chat); + } + else + { + // show on screen and add to history + LLFloaterChat::addChat(chat, FALSE, FALSE); + } +} + +void check_translate_chat(const std::string &mesg, LLChat &chat, const BOOL history) +{ + const bool translate = LLUI::sConfigGroup->getBOOL("TranslateChat"); + + if (translate && chat.mSourceType != CHAT_SOURCE_SYSTEM) + { + const std::string &fromLang = chat.mLanguage; + const std::string &toLang = LLUI::getTranslateLanguage(); + LLChat *newChat = new LLChat(chat); + + LLHTTPClient::ResponderPtr result = ChatTranslationReceiver::build(fromLang, toLang, mesg, newChat, history); + LLTranslate::translate_message(result, fromLang, toLang, mesg); + } + else + { + chat.mText += mesg; + add_floater_chat(chat, history); + } +} + void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) { LLChat chat; @@ -2243,6 +2324,7 @@ LLUUID owner_id; BOOL is_owned_by_me = FALSE; LLViewerObject* chatter; + std::string language; msg->getString("ChatData", "FromName", from_name); chat.mFromName = from_name; @@ -2263,7 +2345,18 @@ chat.mAudible = (EChatAudible)audible_temp; chat.mTime = LLFrameTimer::getElapsedSeconds(); - + + // Empty language value implies automatic language detection. + // TODO: Check if the source is an agent to decide whether to + // read the language value. Waiting on server fix for this. + // if (chat.mSourceType == CHAT_SOURCE_AGENT) + int languageSize = msg->getSize(_PREHASH_ChatData, _PREHASH_Language); + if (languageSize > 0) + { + msg->getString(_PREHASH_ChatData, _PREHASH_Language, language); + chat.mLanguage = language; + } + BOOL is_busy = gAgent.getBusy(); BOOL is_muted = FALSE; @@ -2324,13 +2417,9 @@ if (prefix == "/me " || prefix == "/me'") { chat.mText = from_name; - chat.mText += mesg.substr(3); + mesg = mesg.substr(3); ircstyle = TRUE; } - else - { - chat.mText = mesg; - } // Look for the start of typing so we can put "..." in the bubbles. if (CHAT_TYPE_START == chat.mChatType) @@ -2402,7 +2491,6 @@ chat.mText = from_name; chat.mText += verb; - chat.mText += mesg; } if (chatter) @@ -2429,12 +2517,12 @@ && (is_linden || !is_busy || is_owned_by_me)) { // show on screen and add to history - LLFloaterChat::addChat(chat, FALSE, FALSE); + check_translate_chat(mesg, chat, FALSE); } else { // just add to chat history - LLFloaterChat::addChatHistory(chat); + check_translate_chat(mesg, chat, TRUE); } } } Index: indra/newview/tests/lltranslate_test.cpp =================================================================== --- indra/newview/tests/lltranslate_test.cpp (revision 0) +++ indra/newview/tests/lltranslate_test.cpp (revision 0) @@ -0,0 +1,336 @@ +/** +* @file lltranslate_test.cpp +* @brief Tests LLTranslate which translates between human languages. +* +* $LicenseInfo:firstyear=2001&license=viewergpl$ +* +* Copyright (c) 2001-2009, Linden Research, Inc. +* +* Second Life Viewer Source Code +* The source code in this file ("Source Code") is provided by Linden Lab +* to you under the terms of the GNU General Public License, version 2.0 +* ("GPL"), unless you have obtained a separate licensing agreement +* ("Other License"), formally executed by you and Linden Lab. Terms of +* the GPL can be found in doc/GPL-license.txt in this distribution, or +* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 +* +* There are special exceptions to the terms and conditions of the GPL as +* it is applied to this Source Code. View the full text of the exception +* in the file doc/FLOSS-exception.txt in this software distribution, or +* online at +* http://secondlifegrid.net/programs/open_source/licensing/flossexception +* +* By copying, modifying or distributing this software, you acknowledge +* that you have read and understood your obligations described above, +* and agree to abide by those obligations. +* +* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO +* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, +* COMPLETENESS OR PERFORMANCE. +* $/LicenseInfo$ +*/ +#include "../test/lltut.h" +#include "../lltranslate.h" + +#include "llerror.h" +#include "llsdhttpserver.h" +#include "lliohttpserver.h" +#include "llhttpclient.h" +#include "indra_constants.h" + +namespace tut +{ + struct TranslateTestData + { + public: + TranslateTestData() + { + apr_pool_create(&mPool, NULL); + mServerPump = new LLPumpIO(mPool); + mClientPump = new LLPumpIO(mPool); + + LLHTTPClient::setPump(*mClientPump); + } + + ~TranslateTestData() + { + delete mServerPump; + delete mClientPump; + apr_pool_destroy(mPool); + } + + void setupTheServer() + { + LLHTTPNode& root = LLIOHTTPServer::create(mPool, *mServerPump, 8888); + + LLHTTPStandardServices::useServices(); + LLHTTPRegistrar::buildAllServices(root); + } + + void runThePump(float timeout = 100.0f) + { + LLTimer timer; + timer.setTimerExpirySec(timeout); + + while(!mSawCompleted && !timer.hasExpired()) + { + if (mServerPump) + { + mServerPump->pump(); + mServerPump->callback(); + } + if (mClientPump) + { + mClientPump->pump(); + mClientPump->callback(); + } + } + } + + void killServer() + { + delete mServerPump; + mServerPump = NULL; + } + + private: + apr_pool_t* mPool; + LLPumpIO* mServerPump; + LLPumpIO* mClientPump; + + protected: + void ensureStatusOK() + { + if (mSawError) + { + std::string msg = + llformat("error() called when not expected, status %d", + mStatus); + fail(msg); + } + } + + void ensureStatusError() + { + if (!mSawError) + { + fail("error() wasn't called"); + } + } + + std::string getResult() + { + return mResult; + } + + protected: + bool mSawError; + U32 mStatus; + std::string mReason; + bool mSawCompleted; + std::string mResult; + bool mResultDeleted; + + class TranslationTestReceiver: public LLTranslate::TranslationReceiver + { + public: + TranslationTestReceiver(const std::string &fromLang, const std::string &toLang, + const std::string &mesg, TranslateTestData &translationData) + : LLTranslate::TranslationReceiver(fromLang, toLang, mesg), + mClient(translationData) + { + } + + ~TranslationTestReceiver() + { + mClient.mResultDeleted = true; + } + + virtual void error(U32 status, const std::string& reason) + { + mClient.mSawError = true; + mClient.mStatus = status; + mClient.mReason = reason; + } + + static boost::intrusive_ptr build(const std::string &fromLang, const std::string &toLang, + const std::string &mesg, TranslateTestData &translationData) + { + return boost::intrusive_ptr(new TranslationTestReceiver(fromLang, toLang, mesg, translationData)); + } + + protected: + void handleResponse(const std::string &translation, const std::string &detectedLanguage) + { + std::string fromLang = (detectedLanguage.length() > 0 ? detectedLanguage : m_fromLang); + LL_INFOS("Translate") << "Translation : " << translation << " (" << + fromLang << ")" << LL_ENDL; + + mClient.mSawCompleted = true; + mClient.mResult = translation; + } + private: + TranslateTestData& mClient; + }; + + friend class TranslationTestReceiver; + + protected: + LLHTTPClient::ResponderPtr newResult(const std::string &fromLang, const std::string &toLang, const std::string &mesg) + { + mSawError = false; + mStatus = 0; + mSawCompleted = false; + mResultDeleted = false; + + return TranslationTestReceiver::build(fromLang, toLang, mesg, *this); + } + }; + + typedef test_group TranslateTestGroup; + typedef TranslateTestGroup::object TranslateTestObject; + TranslateTestGroup translateTestGroup("translate"); + + // Test translation requests aren't throwing an error + template<> template<> + void TranslateTestObject::test<1>() + { + std::string fromLang = "en"; + std::string toLang = "es"; + std::string mesg = "Hello!"; + + setupTheServer(); + LLTranslate::translate_message(newResult(fromLang, toLang, mesg), fromLang, toLang, mesg); + runThePump(); + + ensureStatusOK(); + } + + // Test whether we get a translation back + template<> template<> + void TranslateTestObject::test<2>() + { + std::string fromLang = "en"; + std::string toLang = "es"; + std::string mesg = "Hello!"; + + setupTheServer(); + LLTranslate::translate_message(newResult(fromLang, toLang, mesg), fromLang, toLang, mesg); + runThePump(); + + ensureStatusOK(); + ensure("Translation from English 'Hello!' to Spanish failed, empty string returned", + getResult().length() > 0); + } + + // Test for a correct translation of an ASCII language + template<> template<> + void TranslateTestObject::test<3>() + { + std::string fromLang = "en"; + std::string toLang = "es"; + std::string mesg = "Hello!"; + + setupTheServer(); + LLTranslate::translate_message(newResult(fromLang, toLang, mesg), fromLang, toLang, mesg); + runThePump(); + ensureStatusOK(); + + ensure("Translation from English 'Hello!' to Spanish failed, expected 'Hola'", + getResult() == "Hola!"); + } + + // Test sending multiple requests simultaneously + template<> template<> + void TranslateTestObject::test<4>() + { + setupTheServer(); + char buff[32]; + for (int i = 0; i < 5; i++) + { + std::string fromLang = "en"; + std::string toLang = "es"; + sprintf(buff, "Hello %d!", i); + std::string mesg = buff; + + LLTranslate::translate_message(newResult(fromLang, toLang, mesg), fromLang, toLang, mesg); + runThePump(); + ensureStatusOK(); + } + } + + // Test 'translating' symbols that may need escaping + template<> template<> + void TranslateTestObject::test<5>() + { + std::string fromLang = "en"; + std::string toLang = "en"; + std::string mesg = ".?<>,/=&!@#$%^*()-_+[]{};:'\"\\|~`"; + + setupTheServer(); + + for (unsigned int i = 0; i < mesg.length(); i++) + { + char c = mesg.at(i); + std::stringstream ss; + std::string s; + ss << c; + ss >> s; + LLTranslate::translate_message(newResult(fromLang, toLang, s), fromLang, toLang, s); + runThePump(); + + ensureStatusOK(); + std::string error = "Translation of symbol '" + s + "' failed, returned '" + getResult() + "'"; + ensure(error, getResult().compare(s) == 0); + } + } + + // Test for the correct sending of non ascii languages, + // this depends on having a User-Agent header in the URL request + template<> template<> + void TranslateTestObject::test<6>() + { + std::string fromLang = "ja"; + std::string toLang = "en"; + std::string mesg = "木"; + + setupTheServer(); + LLTranslate::translate_message(newResult(fromLang, toLang, mesg), fromLang, toLang, mesg); + runThePump(); + + ensureStatusOK(); + ensure("Translation of non-ascii text failed (Japanese->English) .. expected 'Tree'", getResult() == "Tree"); + } + + // Test for automatic recognition of a non-ASCII language + template<> template<> + void TranslateTestObject::test<7>() + { + std::string fromLang = ""; + std::string toLang = "en"; + std::string mesg = "木"; + + setupTheServer(); + LLTranslate::translate_message(newResult(fromLang, toLang, mesg), fromLang, toLang, mesg); + runThePump(); + + ensureStatusOK(); + ensure("Translation of non-ascii text failed (Automatic->English) .. expected 'Tree'", getResult() == "Tree"); + } + + // Test for automatic translation to a non-ASCII language + template<> template<> + void TranslateTestObject::test<8>() + { + std::string fromLang = ""; + std::string toLang = "ja"; + std::string mesg = "Tree"; + + setupTheServer(); + LLTranslate::translate_message(newResult(fromLang, toLang, mesg), fromLang, toLang, mesg); + runThePump(); + + ensureStatusOK(); + ensure("Translation to non-ascii text failed (Automatic->Japanese) .. expected '木'", getResult() == "木"); + } +} Index: indra/newview/llviewermessage.h =================================================================== --- indra/newview/llviewermessage.h (revision 2776) +++ indra/newview/llviewermessage.h (working copy) @@ -36,6 +36,7 @@ #include "llinstantmessage.h" #include "lltransactiontypes.h" #include "lluuid.h" +#include "llchat.h" #include "stdenums.h" // @@ -74,6 +75,9 @@ void process_script_question(LLMessageSystem *msg, void **user_data); void process_chat_from_simulator(LLMessageSystem *mesgsys, void **user_data); +void add_floater_chat(const LLChat &chat, const BOOL history); +void check_translate_chat(const std::string &mesg, LLChat &chat, const BOOL history); + //void process_agent_to_new_region(LLMessageSystem *mesgsys, void **user_data); void send_agent_update(BOOL force_send, BOOL send_reliable = FALSE); void process_object_update(LLMessageSystem *mesgsys, void **user_data); Index: indra/newview/app_settings/settings.xml =================================================================== --- indra/newview/app_settings/settings.xml (revision 2776) +++ indra/newview/app_settings/settings.xml (working copy) @@ -5191,6 +5191,28 @@ Value 1 + TranslateLanguage + + Comment + Translate Language specifier + Persist + 1 + Type + String + Value + default + + TranslateChat + + Comment + Translate incoming chat messages + Persist + 1 + Type + Boolean + Value + 0 + LastFeatureVersion Comment Index: indra/newview/llprefschat.cpp =================================================================== --- indra/newview/llprefschat.cpp (revision 2776) +++ indra/newview/llprefschat.cpp (working copy) @@ -73,6 +73,8 @@ BOOL mScriptErrorAsChat; F32 mConsoleOpacity; F32 mBubbleOpacity; + std::string mTranslateLanguage; + BOOL mTranslateChat; }; @@ -107,6 +109,8 @@ childSetValue("play_typing_animation", gSavedSettings.getBOOL("PlayTypingAnim")); childSetValue("console_opacity", gSavedSettings.getF32("ConsoleBackgroundOpacity")); childSetValue("bubble_chat_opacity", gSavedSettings.getF32("ChatBubbleOpacity")); + childSetValue("translate_language_combobox", gSavedSettings.getString("TranslateLanguage")); + childSetValue("translate_chat", gSavedSettings.getBOOL("TranslateChat")); } void LLPrefsChatImpl::refreshValues() @@ -133,6 +137,8 @@ mPlayTypingAnim = gSavedSettings.getBOOL("PlayTypingAnim"); mConsoleOpacity = gSavedSettings.getF32("ConsoleBackgroundOpacity"); mBubbleOpacity = gSavedSettings.getF32("ChatBubbleOpacity"); + mTranslateLanguage = gSavedSettings.getString("TranslateLanguage"); + mTranslateChat = gSavedSettings.getBOOL("TranslateChat"); } void LLPrefsChatImpl::cancel() @@ -158,6 +164,8 @@ gSavedSettings.setBOOL("PlayTypingAnim", mPlayTypingAnim); gSavedSettings.setF32("ConsoleBackgroundOpacity", mConsoleOpacity); gSavedSettings.setF32("ChatBubbleOpacity", mBubbleOpacity); + gSavedSettings.setString("TranslateLanguage", mTranslateLanguage); + gSavedSettings.setBOOL("TranslateChat", mTranslateChat); } void LLPrefsChatImpl::apply() @@ -189,6 +197,9 @@ gSavedSettings.setF32("ConsoleBackgroundOpacity", childGetValue("console_opacity").asReal()); gSavedSettings.setF32("ChatBubbleOpacity", childGetValue("bubble_chat_opacity").asReal()); + gSavedSettings.setString("TranslateLanguage", childGetValue("translate_language_combobox")); + gSavedSettings.setBOOL("TranslateChat", childGetValue("translate_chat")); + refreshValues(); // member values become the official values and cancel becomes a no-op. } Index: indra/newview/lltranslate.h =================================================================== --- indra/newview/lltranslate.h (revision 0) +++ indra/newview/lltranslate.h (revision 0) @@ -0,0 +1,126 @@ +/** +* @file lltranslate.h +* @brief Human language translation class and JSON response receiver. +* +* $LicenseInfo:firstyear=2002&license=viewergpl$ +* +* Copyright (c) 2002-2009, Linden Research, Inc. +* +* Second Life Viewer Source Code +* The source code in this file ("Source Code") is provided by Linden Lab +* to you under the terms of the GNU General Public License, version 2.0 +* ("GPL"), unless you have obtained a separate licensing agreement +* ("Other License"), formally executed by you and Linden Lab. Terms of +* the GPL can be found in doc/GPL-license.txt in this distribution, or +* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 +* +* There are special exceptions to the terms and conditions of the GPL as +* it is applied to this Source Code. View the full text of the exception +* in the file doc/FLOSS-exception.txt in this software distribution, or +* online at +* http://secondlifegrid.net/programs/open_source/licensing/flossexception +* +* By copying, modifying or distributing this software, you acknowledge +* that you have read and understood your obligations described above, +* and agree to abide by those obligations. +* +* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO +* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, +* COMPLETENESS OR PERFORMANCE. +* $/LicenseInfo$ +*/ + +#ifndef LL_LLTRANSLATE_H +#define LL_LLTRANSLATE_H + +#include "llhttpclient.h" +#include "llbufferstream.h" +#include "jsoncpp/reader.h" + +class LLTranslate +{ +public : + class TranslationReceiver: public LLHTTPClient::Responder + { + protected: + TranslationReceiver(const std::string &fromLang, const std::string &toLang, const std::string &mesg) + : m_fromLang(fromLang), + m_toLang(toLang), + m_mesg(mesg) + { + } + + virtual void handleResponse(const std::string &translation, const std::string &recognizedLang) {} + virtual void handleFailure() {}; + + public: + ~TranslationReceiver() + { + } + + virtual void error(U32 status, const std::string& reason) + { + LL_WARNS("Translate") << "URL Request error: " << reason << LL_ENDL; + handleFailure(); + } + + virtual void completedRaw( + U32 status, + const std::string& reason, + const LLChannelDescriptors& channels, + const LLIOPipe::buffer_ptr_t& buffer) + { + LLBufferStream istr(channels, buffer.get()); + + std::stringstream strstrm; + strstrm << istr.rdbuf(); + const std::string result = strstrm.str(); + + std::string translation; + std::string detectedLanguage; + + if (!parseGoogleTranslate(result, translation, detectedLanguage)) + { + handleFailure(); + return; + } + + // Fix up the response + string_replace_all( translation, "<","<"); + string_replace_all( translation, ">",">"); + string_replace_all( translation, ""","\""); + string_replace_all( translation, "'","'"); + string_replace_all( translation, "&","&"); + string_replace_all( translation, "'","\\"); + + handleResponse(translation, detectedLanguage); + } + + protected: + const std::string m_mesg; + const std::string m_toLang; + const std::string m_fromLang; + }; + + static void translate_message(LLHTTPClient::ResponderPtr &result, const std::string &fromLang, const std::string &toLang, const std::string &mesg); + static float m_GoogleTimeout; + +private: + static void get_translate_url(std::string &translateUrl, const std::string &fromLang, const std::string &toLang, const std::string &text); + static void string_replace_all(std::string& context, const std::string& from, const std::string& to); + static BOOL parseGoogleTranslate(const std::string result, std::string &translation, std::string &detectedLanguage); + + static LLSD m_Header; + static const char* m_GoogleURL; + static const char* m_GoogleLangSpec; + static const char* m_AcceptHeader; + static const char* m_AcceptType; + static const char* m_AgentHeader; + static const char* m_UserAgent; + + static const char* m_GoogleData; + static const char* m_GoogleTranslation; + static const char* m_GoogleLanguage; +}; + +#endif Index: indra/newview/lltranslate.cpp =================================================================== --- indra/newview/lltranslate.cpp (revision 0) +++ indra/newview/lltranslate.cpp (revision 0) @@ -0,0 +1,108 @@ +/** +* @file lltranslate.cpp +* @brief Functions for translating text via Google Translate. +* +* $LicenseInfo:firstyear=2002&license=viewergpl$ +* +* Copyright (c) 2002-2009, Linden Research, Inc. +* +* Second Life Viewer Source Code +* The source code in this file ("Source Code") is provided by Linden Lab +* to you under the terms of the GNU General Public License, version 2.0 +* ("GPL"), unless you have obtained a separate licensing agreement +* ("Other License"), formally executed by you and Linden Lab. Terms of +* the GPL can be found in doc/GPL-license.txt in this distribution, or +* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 +* +* There are special exceptions to the terms and conditions of the GPL as +* it is applied to this Source Code. View the full text of the exception +* in the file doc/FLOSS-exception.txt in this software distribution, or +* online at +* http://secondlifegrid.net/programs/open_source/licensing/flossexception +* +* By copying, modifying or distributing this software, you acknowledge +* that you have read and understood your obligations described above, +* and agree to abide by those obligations. +* +* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO +* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, +* COMPLETENESS OR PERFORMANCE. +* $/LicenseInfo$ +*/ + +#include "llviewerprecompiledheaders.h" + +#include "llbufferstream.h" +#include "lltranslate.h" + +// These two are concatenated with the language specifiers to form a complete Google Translate URL +const char* LLTranslate::m_GoogleURL = "http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q="; +const char* LLTranslate::m_GoogleLangSpec = "&langpair="; +float LLTranslate::m_GoogleTimeout = 10; + +LLSD LLTranslate::m_Header; +// These constants are for the GET header. +const char* LLTranslate::m_AcceptHeader = "Accept"; +const char* LLTranslate::m_AcceptType = "Accept: text/plain"; +const char* LLTranslate::m_AgentHeader = "User-Agent"; +const char* LLTranslate::m_UserAgent = "User-Agent: Snowglobe Second Life Viewer"; + +// These constants are in the JSON returned from Google +const char* LLTranslate::m_GoogleData = "responseData"; +const char* LLTranslate::m_GoogleTranslation = "translatedText"; +const char* LLTranslate::m_GoogleLanguage = "detectedSourceLanguage"; + +void LLTranslate::translate_message(LLHTTPClient::ResponderPtr &result, const std::string &fromLang, const std::string &toLang, const std::string &mesg) +{ + std::string url; + get_translate_url(url, fromLang, toLang, mesg); + + if (!m_Header.size()) + { + m_Header.insert(m_AcceptHeader, LLSD(m_AcceptType)); + m_Header.insert(m_AgentHeader, LLSD(m_UserAgent)); + } + + LLHTTPClient::get(url, result, m_Header, m_GoogleTimeout); +} + +void LLTranslate::get_translate_url(std::string &translateUrl, const std::string &fromLang, const std::string &toLang, const std::string &mesg) +{ + std::string escaped_mesg = curl_escape(mesg.c_str(), mesg.size()); + + translateUrl = m_GoogleURL + + escaped_mesg + m_GoogleLangSpec + + fromLang // 'from' language; empty string for auto + + "%7C" // | + + toLang; // 'to' language +} + + +void LLTranslate::string_replace_all(std::string& context, const std::string& from, const std::string& to) +{ + size_t lookHere = 0; + size_t foundHere; + + while((foundHere = context.find(from, lookHere)) + != std::string::npos) { + context.replace(foundHere, from.size(), to); + lookHere = foundHere + to.size(); + } +} + + +BOOL LLTranslate::parseGoogleTranslate(const std::string result, std::string &translation, std::string &detectedLanguage) +{ + Json::Value root; + Json::Reader reader; + BOOL parsingSuccessful = reader.parse(result, root ); + if ( !parsingSuccessful ) + { + LL_WARNS("JSON") << reader.getFormatedErrorMessages() << LL_ENDL; + return FALSE; + } + + translation = root[m_GoogleData].get(m_GoogleTranslation, "").asString(); + detectedLanguage = root[m_GoogleData].get(m_GoogleLanguage, "").asString(); + return TRUE; +} Index: indra/newview/skins/default/xui/uk/panel_preferences_chat.xml =================================================================== --- indra/newview/skins/default/xui/uk/panel_preferences_chat.xml (revision 2776) +++ indra/newview/skins/default/xui/uk/panel_preferences_chat.xml (working copy) @@ -52,4 +52,62 @@ + + + За замовчуванням + + + English (Англійська) + + + Dansk (Данська) - Beta + + + Deutsch (Німецька) - Beta + + + Español (Іспанська) - Beta + + + Français (Французька) - Beta + + + Italiano (Італійська) - Beta + + + Magyar (Угорська) - Beta + + + Nederlands (Голландська) - Beta + + + Polski (Польська) - Beta + + + Portugués (Португальська) - Beta + + + Русский - Beta + + + Türkçe (Турецька) - Beta + + + Українська - Beta + + + 中文 (简体) (Китайська) - Beta + + + 日本語 (Японська) - Beta + + + 한국어 (Корейська) - Beta + + + + Чат мову: + + + Index: indra/newview/skins/default/xui/zh/panel_preferences_chat.xml =================================================================== --- indra/newview/skins/default/xui/zh/panel_preferences_chat.xml (revision 2776) +++ indra/newview/skins/default/xui/zh/panel_preferences_chat.xml (working copy) @@ -68,5 +68,62 @@ 脚本错误: - + + + 系统默认值 + + + English （英语） + + + Dansk （丹麦）- 测试版 + + + Deutsch （德语）- 测试版 + + + Español （西班牙语）- 测试版 + + + Français （法语）- 测试版 + + + Italiano （意大利语）- 测试版 + + + Magyar 马札儿语（匈牙利）- 测试版 + + + Nederlands （荷兰语）- 测试版 + + + Polski （波兰）- 测试版 + + + Português （葡萄牙语）- 测试版 + + + Русский （俄罗斯语）- 测试版 + + + Türkçe （土耳其语）- 测试版 + + + Українська （乌克兰语）- 测试版 + + + 中文 （简体）- 测试版 + + + 日本語 （日语）- 测试版 + + + 한국어 （朝鲜语）- 测试版 + + + + 聊天語言: + + + Index: indra/newview/skins/default/xui/pt/panel_preferences_chat.xml =================================================================== --- indra/newview/skins/default/xui/pt/panel_preferences_chat.xml (revision 2776) +++ indra/newview/skins/default/xui/pt/panel_preferences_chat.xml (working copy) @@ -56,4 +56,62 @@ + + + Padrão do Sistema + + + English (Inglês) + + + Dansk (Dinamarquês) - Beta + + + Deutsch (Alemão) - Beta + + + Español (Espanhol) - Beta + + + Français (Francês) - Beta + + + Italiano - Beta + + + Magyar (Húngaro) - Beta + + + Nederlands (Holandês) - Beta + + + Polski (Polonês) - Beta + + + Português - Beta + + + Русский (Russo) - Beta + + + Türkçe (Turco) - Beta + + + Українська (Ucraniano) - Beta + + + 中文 (简体) (Chinês) - Beta + + + 日本語 (Japonês) - Beta + + + 한국어 (Coreano) - Beta + + + + Chat Língua: + + + Index: indra/newview/skins/default/xui/da/panel_preferences_chat.xml =================================================================== --- indra/newview/skins/default/xui/da/panel_preferences_chat.xml (revision 2776) +++ indra/newview/skins/default/xui/da/panel_preferences_chat.xml (working copy) @@ -58,4 +58,62 @@ + + + System standard + + + English (Engelsk) + + + Dansk - Beta + + + Deutsch (Tysk) - Beta + + + Español (Spansk) - Beta + + + Français (Fransk) - Beta + + + Italiano (Italiensk) - Beta + + + Magyar (Ungarsk) - Beta + + + Nederlands (Hollandsk) - Beta + + + Polski (Polsk) - Beta + + + Portugués (Portugisisk) - Beta + + + Русский (Russisk) - Beta + + + Türkçe (Tyrkisk) - Beta + + + Українська (Ukrainsk) - Beta + + + 中文 (简体) (Kinesisk) - Beta + + + 日本語 (Japansk) - Beta + + + 한국어 (Koreansk) - Beta + + + + Chat Sprog: + + + Index: indra/newview/skins/default/xui/tr/panel_preferences_chat.xml =================================================================== --- indra/newview/skins/default/xui/tr/panel_preferences_chat.xml (revision 2776) +++ indra/newview/skins/default/xui/tr/panel_preferences_chat.xml (working copy) @@ -51,4 +51,62 @@ + + + Sistem dili + + + English (İngilizce) + + + Dansk (Danimarkaca) - Beta + + + Deutsch (Almanca) - Beta + + + Español (İspanyolca) - Beta + + + Français (Fransızca) - Beta + + + Italiano (İtalyanca) - Beta + + + Magyar (Macarca) - Beta + + + Nederlands (Flemenkçe) - Beta + + + Polski (Polonyaca) - Beta + + + Portugués (Portekizce) - Beta + + + Русский (Rusça) - Beta + + + Türkçe - Beta + + + Українська (Ukraynaca) - Beta + + + 中文 (简体) (Çince) - Beta + + + 日本語 (Japonca) - Beta + + + 한국어 (Korece) - Beta + + + + Sohbet Dili: + + + Index: indra/newview/skins/default/xui/ru/panel_preferences_chat.xml =================================================================== --- indra/newview/skins/default/xui/ru/panel_preferences_chat.xml (revision 2776) +++ indra/newview/skins/default/xui/ru/panel_preferences_chat.xml (working copy) @@ -52,4 +52,62 @@ + + + По умолчанию + + + English (Английский) + + + Dansk (Датский) - Beta + + + Deutsch (Немецкий) - Beta + + + Español (Испанский) - Beta + + + Français (Французский) - Beta + + + Italiano (Итальянский) - Beta + + + Magyar (Венгерский) - Beta + + + Nederlands (Голландский) - Beta + + + Polski (Польский) - Beta + + + Portugués (Португальский) - Beta + + + Русский - Beta + + + Türkçe (Турецкий) - Beta + + + Українська - Beta + + + 中文 (简体) (Китайский) - Beta + + + 日本語 (Японский) - Beta + + + 한국어 (Корейский) - Beta + + + + Чат язык: + + + Index: indra/newview/skins/default/xui/en-us/panel_preferences_web.xml =================================================================== --- indra/newview/skins/default/xui/en-us/panel_preferences_web.xml (revision 2776) +++ indra/newview/skins/default/xui/en-us/panel_preferences_web.xml (working copy) @@ -20,7 +20,7 @@ v_pad="0" width="128"> Browser cache: -