Merge STORM-959

1 files changed, 39 insertions, 0 deletions

diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index 2f60b6b90b..3692f67a8d 100644
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -53,6 +53,45 @@ const char* LLTranslate::m_GoogleData = "responseData";
 const char* LLTranslate::m_GoogleTranslation = "translatedText";
 const char* LLTranslate::m_GoogleLanguage = "detectedSourceLanguage";
 
+// virtual
+void LLTranslate::TranslationReceiver::completedRaw( U32 status,
+													 const std::string& reason,
+													 const LLChannelDescriptors& channels,
+													 const LLIOPipe::buffer_ptr_t& buffer)
+{
+	if (200 <= status && status < 300)
+	{
+		LLBufferStream istr(channels, buffer.get());
+		std::stringstream strstrm;
+		strstrm << istr.rdbuf();
+
+		const std::string result = strstrm.str();
+		std::string translation;
+		std::string detected_language;
+
+		if (!parseGoogleTranslate(result, translation, detected_language))
+		{
+			handleFailure();
+			return;
+		}
+				
+		// Fix up the response
+		LLStringUtil::replaceString(translation, "&lt;", "<");
+		LLStringUtil::replaceString(translation, "&gt;",">");
+		LLStringUtil::replaceString(translation, "&quot;","\"");
+		LLStringUtil::replaceString(translation, "&#39;","'");
+		LLStringUtil::replaceString(translation, "&amp;","&");
+		LLStringUtil::replaceString(translation, "&apos;","'");
+
+		handleResponse(translation, detected_language);
+	}
+	else
+	{
+		LL_WARNS("Translate") << "HTTP request for Google Translate failed with status " << status << ", reason: " << reason << LL_ENDL;
+		handleFailure();
+	}
+}
+
 //static
 void LLTranslate::translateMessage(LLHTTPClient::ResponderPtr &result, const std::string &from_lang, const std::string &to_lang, const std::string &mesg)
 {