Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Translate, with help from Sovereign (translation backend needs an update/fixing)

Browse Source 
Add Translate Chat checkbox back to chat floater, and enable it when applicable(with showTranslationCheckbox()).
Spend the night making it compile with AICurl~
Make the links work all nice despite our old link-unfriendly UI code.
Coax UI bits into agreeing with their new environment.
Updated the links because v-d seems to still have old ones...
Adv. Chat->Translation tab added..

Guess it's your move, again, Sovereign.

This was old, so I updated it, yayyy~
This commit is contained in:
Inusaito Sayori
2012-12-19 01:51:53 -05:00
parent e9a517985b
commit 891457c11a
14 changed files with 1212 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llmessage/aihttptimeoutpolicy.cpp
View File

@@ -955,7 +955,6 @@ P(responderIgnore);
P(setDisplayNameResponder); P(setDisplayNameResponder);
P2(simulatorFeaturesReceived, transfer_22s_connect_10s); P2(simulatorFeaturesReceived, transfer_22s_connect_10s);
P2(startGroupVoteResponder, transfer_300s); P2(startGroupVoteResponder, transfer_300s);
P(translationReceiver);
P(uploadModelPremissionsResponder); P(uploadModelPremissionsResponder);
P(verifiedDestinationResponder); P(verifiedDestinationResponder);
P(viewerChatterBoxInvitationAcceptResponder); P(viewerChatterBoxInvitationAcceptResponder);

3
indra/newview/CMakeLists.txt
View File

@@ -403,6 +403,7 @@ set(viewer_SOURCE_FILES
llpanelprimmediacontrols.cpp llpanelprimmediacontrols.cpp
llpanelprofile.cpp llpanelprofile.cpp
llpanelskins.cpp llpanelskins.cpp
llpaneltranslationsettings.cpp
llpanelvoicedevicesettings.cpp llpanelvoicedevicesettings.cpp
llpanelvoiceeffect.cpp llpanelvoiceeffect.cpp
llpanelvolume.cpp llpanelvolume.cpp
@@ -482,6 +483,7 @@ set(viewer_SOURCE_FILES
lltoolselectrect.cpp lltoolselectrect.cpp
lltoolview.cpp lltoolview.cpp
lltracker.cpp lltracker.cpp
lltranslate.cpp
lluploaddialog.cpp lluploaddialog.cpp
lluploadfloaterobservers.cpp lluploadfloaterobservers.cpp
llurl.cpp llurl.cpp
@@ -934,6 +936,7 @@ set(viewer_HEADER_FILES
llpanelprimmediacontrols.h llpanelprimmediacontrols.h
llpanelprofile.h llpanelprofile.h
llpanelskins.h llpanelskins.h
llpaneltranslationsettings.h
llpanelvoicedevicesettings.h llpanelvoicedevicesettings.h
llpanelvoiceeffect.h llpanelvoiceeffect.h
llpanelvolume.h llpanelvolume.h

55
indra/newview/app_settings/settings.xml
View File

@@ -16872,6 +16872,61 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>1</integer>
</map> </map>
<key>TranslateLanguage</key>
<map>
<key>Comment</key>
<string>Translate Language specifier</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>default</string>
</map>
<key>TranslateChat</key>
<map>
<key>Comment</key>
<string>Translate incoming chat messages</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>TranslationService</key>
<map>
<key>Comment</key>
<string>Translation API to use. (google|bing)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>bing</string>
</map>
<key>GoogleTranslateAPIKey</key>
<map>
<key>Comment</key>
<string>Google Translate API key</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
</map>
<key>BingTranslateAPIKey</key>
<map>
<key>Comment</key>
<string>Bing AppID to use with the Microsoft Translator API</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
</map>
<key>InterpolationTime</key> <key>InterpolationTime</key>
<map> <map>
<key>Comment</key> <key>Comment</key>

7
indra/newview/ascentprefschat.cpp
View File

@@ -41,6 +41,7 @@
#include "llradiogroup.h" #include "llradiogroup.h"
#include "lluictrlfactory.h" #include "lluictrlfactory.h"
#include "llviewercontrol.h" #include "llviewercontrol.h"
#include "llpaneltranslationsettings.h"
#include "NACLantispam.h" #include "NACLantispam.h"
#include "lgghunspell_wrapper.h" #include "lgghunspell_wrapper.h"
#include "lltrans.h" #include "lltrans.h"
@@ -48,9 +49,12 @@
#include "llstartup.h" #include "llstartup.h"
static void* createTranslationPanel(void*) { return LLPanelTranslationSettings::getInstance(); }
LLPrefsAscentChat::LLPrefsAscentChat() LLPrefsAscentChat::LLPrefsAscentChat()
{ {
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_chat.xml"); mFactoryMap["Translation Panel"] = LLCallbackMap(createTranslationPanel, NULL);
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_chat.xml", &getFactoryMap());
getChild<LLUICtrl>("SpellBase")->setCommitCallback(boost::bind(&LLPrefsAscentChat::onSpellBaseComboBoxCommit, this, _2)); getChild<LLUICtrl>("SpellBase")->setCommitCallback(boost::bind(&LLPrefsAscentChat::onSpellBaseComboBoxCommit, this, _2));
getChild<LLUICtrl>("EmSpell_EditCustom")->setCommitCallback(boost::bind(&LLPrefsAscentChat::onSpellEditCustom, this)); getChild<LLUICtrl>("EmSpell_EditCustom")->setCommitCallback(boost::bind(&LLPrefsAscentChat::onSpellEditCustom, this));
@@ -557,5 +561,6 @@ void LLPrefsAscentChat::apply()
{ {
refreshValues(); refreshValues();
refresh(); refresh();
LLPanelTranslationSettings::getInstance()->apply();
} }

7
indra/newview/llfloaterchat.cpp
View File

@@ -60,6 +60,7 @@
#include "llparticipantlist.h" #include "llparticipantlist.h"
#include "llspeakers.h" #include "llspeakers.h"
#include "llstylemap.h" #include "llstylemap.h"
#include "lltranslate.h"
#include "lluictrlfactory.h" #include "lluictrlfactory.h"
#include "llviewermessage.h" #include "llviewermessage.h"
#include "llviewertexteditor.h" #include "llviewertexteditor.h"
@@ -96,6 +97,7 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed)
getChild<LLUICtrl>("show mutes")->setCommitCallback(boost::bind(&LLFloaterChat::onClickToggleShowMute, this, _2, getChild<LLTextEditor>("Chat History Editor"), history_editor_with_mute)); getChild<LLUICtrl>("show mutes")->setCommitCallback(boost::bind(&LLFloaterChat::onClickToggleShowMute, this, _2, getChild<LLTextEditor>("Chat History Editor"), history_editor_with_mute));
history_editor_with_mute->setVisible(false); history_editor_with_mute->setVisible(false);
getChild<LLUICtrl>("chat_history_open")->setCommitCallback(boost::bind(show_log_browser, "chat", "chat")); getChild<LLUICtrl>("chat_history_open")->setCommitCallback(boost::bind(show_log_browser, "chat", "chat"));
getChildView("translate chat")->setEnabled(LLTranslate::isTranslationConfigured());
} }
LLFloaterChat::~LLFloaterChat() LLFloaterChat::~LLFloaterChat()
@@ -344,6 +346,11 @@ void LLFloaterChat::onClickToggleShowMute(bool show_mute, LLTextEditor* history_
(show_mute ? history_editor_with_mute : history_editor)->setCursorAndScrollToEnd(); (show_mute ? history_editor_with_mute : history_editor)->setCursorAndScrollToEnd();
} }
void LLFloaterChat::showTranslationCheckbox(bool show)
{
getChildView("translate chat")->setEnabled(show);
}
// Put a line of chat in all the right places // Put a line of chat in all the right places
void LLFloaterChat::addChat(const LLChat& chat, void LLFloaterChat::addChat(const LLChat& chat,
BOOL from_instant_message, BOOL from_instant_message,

1
indra/newview/llfloaterchat.h
View File

@@ -72,6 +72,7 @@ public:
void onClickToggleShowMute(bool show_mute, class LLTextEditor* history_editor, LLTextEditor* history_editor_with_mute); void onClickToggleShowMute(bool show_mute, class LLTextEditor* history_editor, LLTextEditor* history_editor_with_mute);
static void chatFromLogFile(LLLogChat::ELogLineType type, std::string line, void* userdata); static void chatFromLogFile(LLLogChat::ELogLineType type, std::string line, void* userdata);
void showTranslationCheckbox(bool show);
static void loadHistory(); static void loadHistory();
static void* createSpeakersPanel(void* data); static void* createSpeakersPanel(void* data);
static void* createChatPanel(void* data); static void* createChatPanel(void* data);

320
indra/newview/llpaneltranslationsettings.cpp Normal file
View File

@@ -0,0 +1,320 @@
/**
* @file llpaneltranslationsettings.cpp
* @brief Machine translation settings for chat
*
* $LicenseInfo:firstyear=2011&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2011, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
#include "llpaneltranslationsettings.h"
// Viewer includes
#include "llfloaterchat.h"
#include "lltranslate.h"
#include "llviewercontrol.h" // for gSavedSettings
// Linden library includes
#include "llbutton.h"
#include "llcheckboxctrl.h"
#include "llcombobox.h"
#include "lllineeditor.h"
#include "llnotificationsutil.h"
#include "llradiogroup.h"
#include "lltexteditor.h"
#include "lluictrlfactory.h"
class EnteredKeyVerifier : public LLTranslate::KeyVerificationReceiver
{
public:
EnteredKeyVerifier(LLTranslate::EService service, bool alert)
: LLTranslate::KeyVerificationReceiver(service)
, mAlert(alert)
{
}
private:
/*virtual*/ void setVerificationStatus(bool ok)
{
LLPanelTranslationSettings* panel = LLPanelTranslationSettings::getInstance();
if (!panel)
{
llwarns << "The translation settings panel has disappeared!" << llendl;
return;
}
switch (getService())
{
case LLTranslate::SERVICE_BING:
panel->setBingVerified(ok, mAlert);
break;
case LLTranslate::SERVICE_GOOGLE:
panel->setGoogleVerified(ok, mAlert);
break;
}
}
/*virtual*/ const char* getName() const { return "EnteredKeyVerifier"; }
bool mAlert;
};
LLPanelTranslationSettings::LLPanelTranslationSettings()
: mMachineTranslationCB(NULL)
, mLanguageCombo(NULL)
, mTranslationServiceRadioGroup(NULL)
, mBingAPIKeyEditor(NULL)
, mGoogleAPIKeyEditor(NULL)
, mBingVerifyBtn(NULL)
, mGoogleVerifyBtn(NULL)
, mBingKeyVerified(false)
, mGoogleKeyVerified(false)
{
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_translation_settings.xml");
mMachineTranslationCB->setValue(gSavedSettings.getBOOL("TranslateChat"));
mLanguageCombo->setSelectedByValue(gSavedSettings.getString("TranslateLanguage"), TRUE);
mTranslationServiceRadioGroup->setSelectedByValue(gSavedSettings.getString("TranslationService"), TRUE);
std::string bing_key = gSavedSettings.getString("BingTranslateAPIKey");
if (!bing_key.empty())
{
mBingAPIKeyEditor->setText(bing_key);
mBingAPIKeyEditor->setTentative(FALSE);
verifyKey(LLTranslate::SERVICE_BING, bing_key, false);
}
else
{
mBingAPIKeyEditor->setTentative(TRUE);
mBingKeyVerified = FALSE;
}
std::string google_key = gSavedSettings.getString("GoogleTranslateAPIKey");
if (!google_key.empty())
{
mGoogleAPIKeyEditor->setText(google_key);
mGoogleAPIKeyEditor->setTentative(FALSE);
verifyKey(LLTranslate::SERVICE_GOOGLE, google_key, false);
}
else
{
mGoogleAPIKeyEditor->setTentative(TRUE);
mGoogleKeyVerified = FALSE;
}
updateControlsEnabledState();
}
// virtual
BOOL LLPanelTranslationSettings::postBuild()
{
mMachineTranslationCB = getChild<LLCheckBoxCtrl>("translate_chat_checkbox");
mLanguageCombo = getChild<LLComboBox>("translate_language_combo");
mTranslationServiceRadioGroup = getChild<LLRadioGroup>("translation_service_rg");
mBingAPIKeyEditor = getChild<LLLineEditor>("bing_api_key");
mGoogleAPIKeyEditor = getChild<LLLineEditor>("google_api_key");
mBingVerifyBtn = getChild<LLButton>("verify_bing_api_key_btn");
mGoogleVerifyBtn = getChild<LLButton>("verify_google_api_key_btn");
mMachineTranslationCB->setCommitCallback(boost::bind(&LLPanelTranslationSettings::updateControlsEnabledState, this));
mTranslationServiceRadioGroup->setCommitCallback(boost::bind(&LLPanelTranslationSettings::updateControlsEnabledState, this));
mBingVerifyBtn->setClickedCallback(boost::bind(&LLPanelTranslationSettings::onBtnBingVerify, this));
mGoogleVerifyBtn->setClickedCallback(boost::bind(&LLPanelTranslationSettings::onBtnGoogleVerify, this));
mBingAPIKeyEditor->setFocusReceivedCallback(boost::bind(&LLPanelTranslationSettings::onEditorFocused, this, _1));
mBingAPIKeyEditor->setKeystrokeCallback(boost::bind(&LLPanelTranslationSettings::onBingKeyEdited, this, _1));
mGoogleAPIKeyEditor->setFocusReceivedCallback(boost::bind(&LLPanelTranslationSettings::onEditorFocused, this, _1));
mGoogleAPIKeyEditor->setKeystrokeCallback(boost::bind(&LLPanelTranslationSettings::onGoogleKeyEdited, this, _1));
// Now set the links, because v3 has special xml linking and we do not.
LLTextEditor* bing_api_key = getChild<LLTextEditor>("bing_api_key_label");
LLTextEditor* google_api_key = getChild<LLTextEditor>("google_api_key_label");
LLTextEditor* google_links = getChild<LLTextEditor>("google_links_text");
google_api_key->setParseHTML(true);
bing_api_key->setParseHTML(true);
google_links->setParseHTML(true);
LLStyleSP link_style(new LLStyle);
link_style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
std::string link_text;
std::string link_url;
link_text = " AppId:";
link_url = "https://datamarket.azure.com/dataset/1899a118-d202-492c-aa16-ba21c33c06cb"; //Microsoft changed their policy, no longer link to "http://www.bing.com/developers/createapp.aspx";
link_style->setLinkHREF(link_url);
bing_api_key->appendStyledText(link_text, false, false, link_style);
link_text = " API key:";
link_url = "https://developers.google.com/translate/v2/getting_started#auth";
link_style->setLinkHREF(link_url);
google_api_key->appendStyledText(link_text, false, false, link_style);
link_text = getString("Pricing");
link_url = "https://developers.google.com/translate/v2/pricing";
link_style->setLinkHREF(link_url);
google_links->appendStyledText(link_text, false, false, link_style);
google_links->appendColoredText(std::string(" | "), false, false, gColors.getColor("TextFgReadOnlyColor"));
link_text = getString("Stats");
link_url = "https://code.google.com/apis/console";
link_style->setLinkHREF(link_url);
google_links->appendStyledText(link_text, false, false, link_style);
//center();
return TRUE;
}
void LLPanelTranslationSettings::setBingVerified(bool ok, bool alert)
{
if (alert)
{
showAlert(ok ? "bing_api_key_verified" : "bing_api_key_not_verified");
}
mBingKeyVerified = ok;
updateControlsEnabledState();
}
void LLPanelTranslationSettings::setGoogleVerified(bool ok, bool alert)
{
if (alert)
{
showAlert(ok ? "google_api_key_verified" : "google_api_key_not_verified");
}
mGoogleKeyVerified = ok;
updateControlsEnabledState();
}
std::string LLPanelTranslationSettings::getSelectedService() const
{
return mTranslationServiceRadioGroup->getSelectedValue().asString();
}
std::string LLPanelTranslationSettings::getEnteredBingKey() const
{
return mBingAPIKeyEditor->getTentative() ? LLStringUtil::null : mBingAPIKeyEditor->getText();
}
std::string LLPanelTranslationSettings::getEnteredGoogleKey() const
{
return mGoogleAPIKeyEditor->getTentative() ? LLStringUtil::null : mGoogleAPIKeyEditor->getText();
}
void LLPanelTranslationSettings::showAlert(const std::string& msg_name) const
{
LLSD args;
args["MESSAGE"] = getString(msg_name);
LLNotificationsUtil::add("GenericAlert", args);
}
void LLPanelTranslationSettings::updateControlsEnabledState()
{
// Enable/disable controls based on the checkbox value.
bool on = mMachineTranslationCB->getValue().asBoolean();
std::string service = getSelectedService();
bool bing_selected = service == "bing";
bool google_selected = service == "google";
mTranslationServiceRadioGroup->setEnabled(on);
mLanguageCombo->setEnabled(on);
getChild<LLTextEditor>("bing_api_key_label")->setVisible(bing_selected);
mBingAPIKeyEditor->setVisible(bing_selected);
mBingVerifyBtn->setVisible(bing_selected);
getChild<LLTextEditor>("google_api_key_label")->setVisible(google_selected);
getChild<LLTextEditor>("google_links_text")->setVisible(google_selected);
mGoogleAPIKeyEditor->setVisible(google_selected);
mGoogleVerifyBtn->setVisible(google_selected);
mBingAPIKeyEditor->setEnabled(on);
mGoogleAPIKeyEditor->setEnabled(on);
mBingVerifyBtn->setEnabled(on &&
!mBingKeyVerified && !getEnteredBingKey().empty());
mGoogleVerifyBtn->setEnabled(on &&
!mGoogleKeyVerified && !getEnteredGoogleKey().empty());
}
void LLPanelTranslationSettings::verifyKey(int service, const std::string& key, bool alert)
{
LLTranslate::KeyVerificationReceiverPtr receiver =
new EnteredKeyVerifier((LLTranslate::EService) service, alert);
LLTranslate::verifyKey(receiver, key);
}
void LLPanelTranslationSettings::onEditorFocused(LLFocusableElement* control)
{
LLLineEditor* editor = dynamic_cast<LLLineEditor*>(control);
if (editor && editor->hasTabStop()) // if enabled. getEnabled() doesn't work
{
if (editor->getTentative())
{
editor->setText(LLStringUtil::null);
editor->setTentative(FALSE);
}
}
}
void LLPanelTranslationSettings::onBingKeyEdited(LLLineEditor* caller)
{
if (caller->isDirty())
{
setBingVerified(false, false);
}
}
void LLPanelTranslationSettings::onGoogleKeyEdited(LLLineEditor* caller)
{
if (caller->isDirty())
{
setGoogleVerified(false, false);
}
}
void LLPanelTranslationSettings::onBtnBingVerify()
{
std::string key = getEnteredBingKey();
if (!key.empty())
{
verifyKey(LLTranslate::SERVICE_BING, key);
}
}
void LLPanelTranslationSettings::onBtnGoogleVerify()
{
std::string key = getEnteredGoogleKey();
if (!key.empty())
{
verifyKey(LLTranslate::SERVICE_GOOGLE, key);
}
}
void LLPanelTranslationSettings::apply()
{
gSavedSettings.setBOOL("TranslateChat", mMachineTranslationCB->getValue().asBoolean());
gSavedSettings.setString("TranslateLanguage", mLanguageCombo->getSelectedValue().asString());
gSavedSettings.setString("TranslationService", getSelectedService());
gSavedSettings.setString("BingTranslateAPIKey", getEnteredBingKey());
gSavedSettings.setString("GoogleTranslateAPIKey", getEnteredGoogleKey());
LLFloaterChat::getInstance()->showTranslationCheckbox(LLTranslate::isTranslationConfigured());
}

75
indra/newview/llpaneltranslationsettings.h Normal file
View File

@@ -0,0 +1,75 @@
/**
* @file llpaneltranslationsettings.h
* @brief Machine translation settings for chat
*
* $LicenseInfo:firstyear=2011&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2011, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#ifndef LL_LLPANELTRANSLATIONSETTINGS_H
#define LL_LLPANELTRANSLATIONSETTINGS_H
#include "llpanel.h"
class LLButton;
class LLCheckBoxCtrl;
class LLComboBox;
class LLLineEditor;
class LLRadioGroup;
class LLPanelTranslationSettings : public LLPanel, public LLSingleton<LLPanelTranslationSettings>
{
public:
LLPanelTranslationSettings();
/*virtual*/ BOOL postBuild();
void apply();
void setBingVerified(bool ok, bool alert);
void setGoogleVerified(bool ok, bool alert);
private:
std::string getSelectedService() const;
std::string getEnteredBingKey() const;
std::string getEnteredGoogleKey() const;
void showAlert(const std::string& msg_name) const;
void updateControlsEnabledState();
void verifyKey(int service, const std::string& key, bool alert = true);
void onEditorFocused(LLFocusableElement* control);
void onBingKeyEdited(LLLineEditor* caller);
void onGoogleKeyEdited(LLLineEditor* caller);
void onBtnBingVerify();
void onBtnGoogleVerify();
LLCheckBoxCtrl* mMachineTranslationCB;
LLComboBox* mLanguageCombo;
LLLineEditor* mBingAPIKeyEditor;
LLLineEditor* mGoogleAPIKeyEditor;
LLRadioGroup* mTranslationServiceRadioGroup;
LLButton* mBingVerifyBtn;
LLButton* mGoogleVerifyBtn;
bool mBingKeyVerified;
bool mGoogleKeyVerified;
};
#endif // LL_LLPANELTRANSLATIONSETTINGS_H

470
indra/newview/lltranslate.cpp
View File

@@ -2,136 +2,402 @@
* @file lltranslate.cpp * @file lltranslate.cpp
* @brief Functions for translating text via Google Translate. * @brief Functions for translating text via Google Translate.
* *
* $LicenseInfo:firstyear=2009&license=viewergpl$ * $LicenseInfo:firstyear=2009&license=viewerlgpl$
* * Second Life Viewer Source Code
* Copyright (c) 2009, Linden Research, Inc. * Copyright (C) 2010, Linden Research, Inc.
* *
* Second Life Viewer Source Code * This library is free software; you can redistribute it and/or
* The source code in this file ("Source Code") is provided by Linden Lab * modify it under the terms of the GNU Lesser General Public
* to you under the terms of the GNU General Public License, version 2.0 * License as published by the Free Software Foundation;
* ("GPL"), unless you have obtained a separate licensing agreement * version 2.1 of the License only.
* ("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 * This library is distributed in the hope that it will be useful,
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 * but WITHOUT ANY WARRANTY; without even the implied warranty of
* * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* There are special exceptions to the terms and conditions of the GPL as * Lesser General Public License for more details.
* 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 * You should have received a copy of the GNU Lesser General Public
* online at * License along with this library; if not, write to the Free Software
* http://secondlifegrid.net/programs/open_source/licensing/flossexception * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* *
* By copying, modifying or distributing this software, you acknowledge * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* that you have read and understood your obligations described above, * $/LicenseInfo$
* 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 "llviewerprecompiledheaders.h"
#include "llbufferstream.h"
#include "lltranslate.h" #include "lltranslate.h"
#include <curl/curl.h>
#include "llbufferstream.h"
#include "lltrans.h"
#include "llui.h" #include "llui.h"
#include "sgversion.h" #include "llviewercontrol.h"
#include "llweb.h" #include "llweb.h"
// <edit> #include "sgversion.h"
#include "llviewercontrol.h"
// </edit>
// These two are concatenated with the language specifiers to form a complete Google Translate URL #include "json/reader.h"
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;
AIHTTPHeaders LLTranslate::m_Header; // virtual
// These constants are for the GET header. void LLGoogleTranslationHandler::getTranslateURL(
const char* LLTranslate::m_AcceptHeader = "Accept"; std::string &url,
const char* LLTranslate::m_AcceptType = "text/plain"; const std::string &from_lang,
const char* LLTranslate::m_AgentHeader = "User-Agent"; const std::string &to_lang,
const std::string &text) const
// 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";
//static
void LLTranslate::translateMessage(LLHTTPClient::ResponderPtr &result, const std::string &fromLang, const std::string &toLang, const std::string &mesg)
{ {
std::string url; url = std::string("https://www.googleapis.com/language/translate/v2?key=")
getTranslateUrl(url, fromLang, toLang, mesg); + getAPIKey() + "&q=" + LLURI::escape(text) + "&target=" + to_lang;
if (!from_lang.empty())
//<edit>
std::string user_agent = gCurrentVersion;
//</edit>
if (m_Header.empty())
{ {
m_Header.addHeader(m_AcceptHeader, m_AcceptType); url += "&source=" + from_lang;
m_Header.addHeader(m_AgentHeader, user_agent);
}
LLHTTPClient::get(url, result, m_Header, m_GoogleTimeout);
}
//static
void LLTranslate::getTranslateUrl(std::string &translateUrl, const std::string &fromLang, const std::string &toLang, const std::string &mesg)
{
std::string escaped_mesg = LLWeb::curlEscape(mesg);
translateUrl = m_GoogleURL
+ escaped_mesg + m_GoogleLangSpec
+ fromLang // 'from' language; empty string for auto
+ "%7C" // |
+ toLang; // 'to' language
}
//static
void LLTranslate::stringReplaceAll(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();
} }
} }
//static // virtual
BOOL LLTranslate::parseGoogleTranslate(const std::string result, std::string &translation, std::string &detectedLanguage) void LLGoogleTranslationHandler::getKeyVerificationURL(
std::string& url,
const std::string& key) const
{
url = std::string("https://www.googleapis.com/language/translate/v2/languages?key=")
+ key + "&target=en";
}
// virtual
bool LLGoogleTranslationHandler::parseResponse(
int& status,
const std::string& body,
std::string& translation,
std::string& detected_lang,
std::string& err_msg) const
{ {
Json::Value root; Json::Value root;
Json::Reader reader; Json::Reader reader;
BOOL parsingSuccessful = reader.parse(result, root );
if ( !parsingSuccessful ) if (!reader.parse(body, root))
{ {
LL_WARNS("JSON") << reader.getFormatedErrorMessages() << LL_ENDL; err_msg = reader.getFormatedErrorMessages();
return FALSE; return false;
} }
translation = root[m_GoogleData].get(m_GoogleTranslation, "").asString(); if (!root.isObject()) // empty response? should not happen
detectedLanguage = root[m_GoogleData].get(m_GoogleLanguage, "").asString(); {
return TRUE; return false;
}
if (status != STATUS_OK)
{
// Request failed. Extract error message from the response.
parseErrorResponse(root, status, err_msg);
return false;
}
// Request succeeded, extract translation from the response.
return parseTranslation(root, translation, detected_lang);
}
// virtual
bool LLGoogleTranslationHandler::isConfigured() const
{
return !getAPIKey().empty();
}
// static
void LLGoogleTranslationHandler::parseErrorResponse(
const Json::Value& root,
int& status,
std::string& err_msg)
{
const Json::Value& error = root.get("error", 0);
if (!error.isObject() || !error.isMember("message") || !error.isMember("code"))
{
return;
}
err_msg = error["message"].asString();
status = error["code"].asInt();
}
// static
bool LLGoogleTranslationHandler::parseTranslation(
const Json::Value& root,
std::string& translation,
std::string& detected_lang)
{
// JsonCpp is prone to aborting the program on failed assertions,
// so be super-careful and verify the response format.
const Json::Value& data = root.get("data", 0);
if (!data.isObject() || !data.isMember("translations"))
{
return false;
}
const Json::Value& translations = data["translations"];
if (!translations.isArray() || translations.size() == 0)
{
return false;
}
const Json::Value& first = translations[0U];
if (!first.isObject() || !first.isMember("translatedText"))
{
return false;
}
translation = first["translatedText"].asString();
detected_lang = first.get("detectedSourceLanguage", "").asString();
return true;
}
// static
std::string LLGoogleTranslationHandler::getAPIKey()
{
return gSavedSettings.getString("GoogleTranslateAPIKey");
}
// virtual
void LLBingTranslationHandler::getTranslateURL(
std::string &url,
const std::string &from_lang,
const std::string &to_lang,
const std::string &text) const
{
url = std::string("http://api.microsofttranslator.com/v2/Http.svc/Translate?appId=")
+ getAPIKey() + "&text=" + LLURI::escape(text) + "&to=" + getAPILanguageCode(to_lang);
if (!from_lang.empty())
{
url += "&from=" + getAPILanguageCode(from_lang);
}
}
// virtual
void LLBingTranslationHandler::getKeyVerificationURL(
std::string& url,
const std::string& key) const
{
url = std::string("http://api.microsofttranslator.com/v2/Http.svc/GetLanguagesForTranslate?appId=")
+ key;
}
// virtual
bool LLBingTranslationHandler::parseResponse(
int& status,
const std::string& body,
std::string& translation,
std::string& detected_lang,
std::string& err_msg) const
{
if (status != STATUS_OK)
{
static const std::string MSG_BEGIN_MARKER = "Message: ";
size_t begin = body.find(MSG_BEGIN_MARKER);
if (begin != std::string::npos)
{
begin += MSG_BEGIN_MARKER.size();
}
else
{
begin = 0;
err_msg.clear();
}
size_t end = body.find("</p>", begin);
err_msg = body.substr(begin, end-begin);
LLStringUtil::replaceString(err_msg, "&#xD;", ""); // strip CR
return false;
}
// Sample response: <string xmlns="http://schemas.microsoft.com/2003/10/Serialization/">Hola</string>
size_t begin = body.find(">");
if (begin == std::string::npos || begin >= (body.size() - 1))
{
begin = 0;
}
else
{
++begin;
}
size_t end = body.find("</string>", begin);
detected_lang = ""; // unsupported by this API
translation = body.substr(begin, end-begin);
LLStringUtil::replaceString(translation, "&#xD;", ""); // strip CR
return true;
}
// virtual
bool LLBingTranslationHandler::isConfigured() const
{
return !getAPIKey().empty();
}
// static
std::string LLBingTranslationHandler::getAPIKey()
{
return gSavedSettings.getString("BingTranslateAPIKey");
}
// static
std::string LLBingTranslationHandler::getAPILanguageCode(const std::string& lang)
{
return lang == "zh" ? "zh-CHT" : lang; // treat Chinese as Traditional Chinese
}
LLTranslate::TranslationReceiver::TranslationReceiver(const std::string& from_lang, const std::string& to_lang)
: mFromLang(from_lang)
, mToLang(to_lang)
, mHandler(LLTranslate::getPreferredHandler())
{
}
// virtual
void LLTranslate::TranslationReceiver::completedRaw(
const LLChannelDescriptors& channels,
const LLIOPipe::buffer_ptr_t& buffer)
{
LLBufferStream istr(channels, buffer.get());
std::stringstream strstrm;
strstrm << istr.rdbuf();
const std::string body = strstrm.str();
std::string translation, detected_lang, err_msg;
int status = getStatus();
LL_DEBUGS("Translate") << "HTTP status: " << status << " " << getReason() << LL_ENDL;
LL_DEBUGS("Translate") << "Response body: " << body << LL_ENDL;
if (mHandler.parseResponse(status, body, translation, detected_lang, err_msg))
{
// 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_lang);
}
else
{
if (err_msg.empty())
{
err_msg = LLTrans::getString("TranslationResponseParseError");
}
llwarns << "Translation request failed: " << err_msg << llendl;
handleFailure(status, err_msg);
}
}
LLTranslate::KeyVerificationReceiver::KeyVerificationReceiver(EService service)
: mService(service)
{
}
LLTranslate::EService LLTranslate::KeyVerificationReceiver::getService() const
{
return mService;
}
// virtual
void LLTranslate::KeyVerificationReceiver::completedRaw(
const LLChannelDescriptors& channels,
const LLIOPipe::buffer_ptr_t& buffer)
{
bool ok = (getStatus() == 200);
setVerificationStatus(ok);
}
//static
void LLTranslate::translateMessage(
TranslationReceiverPtr &receiver,
const std::string &from_lang,
const std::string &to_lang,
const std::string &mesg)
{
std::string url;
receiver->mHandler.getTranslateURL(url, from_lang, to_lang, mesg);
LL_DEBUGS("Translate") << "Sending translation request: " << url << LL_ENDL;
sendRequest(url, receiver);
}
// static
void LLTranslate::verifyKey(
KeyVerificationReceiverPtr& receiver,
const std::string& key)
{
std::string url;
const LLTranslationAPIHandler& handler = getHandler(receiver->getService());
handler.getKeyVerificationURL(url, key);
LL_DEBUGS("Translate") << "Sending key verification request: " << url << LL_ENDL;
sendRequest(url, receiver);
} }
//static //static
std::string LLTranslate::getTranslateLanguage() std::string LLTranslate::getTranslateLanguage()
{ {
std::string language = "en"; std::string language = gSavedSettings.getString("TranslateLanguage");
if (LLUI::sConfigGroup) if (language.empty() || language == "default")
{ {
language = LLUI::sConfigGroup->getString("TranslateLanguage"); language = LLUI::getLanguage();
if (language.empty() || language == "default")
{
language = LLUI::getLanguage();
}
} }
language = language.substr(0,2); language = language.substr(0,2);
return language; return language;
} }
// static
bool LLTranslate::isTranslationConfigured()
{
return getPreferredHandler().isConfigured();
}
// static
const LLTranslationAPIHandler& LLTranslate::getPreferredHandler()
{
EService service = SERVICE_BING;
std::string service_str = gSavedSettings.getString("TranslationService");
if (service_str == "google")
{
service = SERVICE_GOOGLE;
}
return getHandler(service);
}
// static
const LLTranslationAPIHandler& LLTranslate::getHandler(EService service)
{
static LLGoogleTranslationHandler google;
static LLBingTranslationHandler bing;
if (service == SERVICE_GOOGLE)
{
return google;
}
return bing;
}
// static
void LLTranslate::sendRequest(const std::string& url, LLHTTPClient::ResponderPtr responder)
{
static LLSD sHeader;
if (!sHeader.size())
{
std::string user_agent = llformat("%s %d.%d.%d (%d)",
gVersionChannel,
gVersionMajor,
gVersionMinor,
gVersionPatch,
gVersionBuild);
sHeader.insert("Accept", "text/plain");
sHeader.insert("User-Agent", user_agent);
}
LLHTTPClient::get(url, sHeader, responder);
}

376
indra/newview/lltranslate.h
View File

@@ -2,127 +2,301 @@
* @file lltranslate.h * @file lltranslate.h
* @brief Human language translation class and JSON response receiver. * @brief Human language translation class and JSON response receiver.
* *
* $LicenseInfo:firstyear=2009&license=viewergpl$ * $LicenseInfo:firstyear=2009&license=viewerlgpl$
* * Second Life Viewer Source Code
* Copyright (c) 2009, Linden Research, Inc. * Copyright (C) 2010, Linden Research, Inc.
* *
* Second Life Viewer Source Code * This library is free software; you can redistribute it and/or
* The source code in this file ("Source Code") is provided by Linden Lab * modify it under the terms of the GNU Lesser General Public
* to you under the terms of the GNU General Public License, version 2.0 * License as published by the Free Software Foundation;
* ("GPL"), unless you have obtained a separate licensing agreement * version 2.1 of the License only.
* ("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 * This library is distributed in the hope that it will be useful,
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 * but WITHOUT ANY WARRANTY; without even the implied warranty of
* * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* There are special exceptions to the terms and conditions of the GPL as * Lesser General Public License for more details.
* 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 * You should have received a copy of the GNU Lesser General Public
* online at * License along with this library; if not, write to the Free Software
* http://secondlifegrid.net/programs/open_source/licensing/flossexception * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* *
* By copying, modifying or distributing this software, you acknowledge * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* that you have read and understood your obligations described above, * $/LicenseInfo$
* 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 #ifndef LL_LLTRANSLATE_H
#define LL_LLTRANSLATE_H #define LL_LLTRANSLATE_H
#include "llhttpclient.h" #include "llhttpclient.h"
#include "llbufferstream.h" #include "llbufferstream.h"
#include "json/reader.h" #include "lliopipe.h"
class AIHTTPTimeoutPolicy; namespace Json
extern AIHTTPTimeoutPolicy translationReceiver_timeout;
class LLTranslate
{ {
public : class Value;
class TranslationReceiver : public LLHTTPClient::ResponderWithResult }
{
protected:
TranslationReceiver(const std::string &fromLang, const std::string &toLang)
: m_fromLang(fromLang),
m_toLang(toLang)
{
}
virtual void handleResponse(const std::string &translation, const std::string &recognizedLang) {} /**
virtual void handleFailure() {}; * Handler of an HTTP machine translation service.
*
* Derived classes know the service URL
* and how to parse the translation result.
*/
class LLTranslationAPIHandler
{
public:
/**
* Get URL for translation of the given string.
*
* Sending HTTP GET request to the URL will initiate translation.
*
* @param[out] url Place holder for the result.
* @param from_lang Source language. Leave empty for auto-detection.
* @param to_lang Target language.
* @param text Text to translate.
*/
virtual void getTranslateURL(
std::string &url,
const std::string &from_lang,
const std::string &to_lang,
const std::string &text) const = 0;
public: /**
~TranslationReceiver() * Get URL to verify the given API key.
{ *
} * Sending request to the URL verifies the key.
* Positive HTTP response (code 200) means that the key is valid.
*
* @param[out] url Place holder for the URL.
* @param[in] key Key to verify.
*/
virtual void getKeyVerificationURL(
std::string &url,
const std::string &key) const = 0;
/*virtual*/ void httpFailure(void) /**
{ * Parse translation response.
LL_WARNS("Translate") << "URL Request error: " << reason << LL_ENDL; *
handleFailure(); * @param[in,out] status HTTP status. May be modified while parsing.
} * @param body Response text.
* @param[out] translation Translated text.
* @param[out] detected_lang Detected source language. May be empty.
* @param[out] err_msg Error message (in case of error).
*/
virtual bool parseResponse(
int& status,
const std::string& body,
std::string& translation,
std::string& detected_lang,
std::string& err_msg) const = 0;
/*virtual*/ void completedRaw( /**
LLChannelDescriptors const& channels, * @return if the handler is configured to function properly
LLIOPipe::buffer_ptr_t const& buffer) */
{ virtual bool isConfigured() const = 0;
LLBufferStream istr(channels, buffer.get());
std::stringstream strstrm; virtual ~LLTranslationAPIHandler() {}
strstrm << istr.rdbuf();
const std::string result = strstrm.str();
std::string translation; protected:
std::string detectedLanguage; static const int STATUS_OK = 200;
};
if (!parseGoogleTranslate(result, translation, detectedLanguage)) /// Google Translate v2 API handler.
{ class LLGoogleTranslationHandler : public LLTranslationAPIHandler
handleFailure(); {
return; LOG_CLASS(LLGoogleTranslationHandler);
}
// Fix up the response public:
stringReplaceAll( translation, "&lt;","<"); /*virtual*/ void getTranslateURL(
stringReplaceAll( translation, "&gt;",">"); std::string &url,
stringReplaceAll( translation, "&quot;","\""); const std::string &from_lang,
stringReplaceAll( translation, "&#39;","'"); const std::string &to_lang,
stringReplaceAll( translation, "&amp;","&"); const std::string &text) const;
stringReplaceAll( translation, "&apos;","'"); /*virtual*/ void getKeyVerificationURL(
std::string &url,
handleResponse(translation, detectedLanguage); const std::string &key) const;
} /*virtual*/ bool parseResponse(
int& status,
/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return translationReceiver_timeout; } const std::string& body,
std::string& translation,
protected: std::string& detected_lang,
const std::string m_toLang; std::string& err_msg) const;
const std::string m_fromLang; /*virtual*/ bool isConfigured() const;
};
static void translateMessage(LLHTTPClient::ResponderPtr &result, const std::string &fromLang, const std::string &toLang, const std::string &mesg);
static float m_GoogleTimeout;
static std::string getTranslateLanguage();
private: private:
static void getTranslateUrl(std::string &translateUrl, const std::string &fromLang, const std::string &toLang, const std::string &text); static void parseErrorResponse(
static void stringReplaceAll(std::string& context, const std::string& from, const std::string& to); const Json::Value& root,
static BOOL parseGoogleTranslate(const std::string result, std::string &translation, std::string &detectedLanguage); int& status,
std::string& err_msg);
static bool parseTranslation(
const Json::Value& root,
std::string& translation,
std::string& detected_lang);
static std::string getAPIKey();
};
static AIHTTPHeaders m_Header; /// Microsoft Translator v2 API handler.
static const char* m_GoogleURL; class LLBingTranslationHandler : public LLTranslationAPIHandler
static const char* m_GoogleLangSpec; {
static const char* m_AcceptHeader; LOG_CLASS(LLBingTranslationHandler);
static const char* m_AcceptType;
static const char* m_AgentHeader;
static const char* m_UserAgent;
static const char* m_GoogleData; public:
static const char* m_GoogleTranslation; /*virtual*/ void getTranslateURL(
static const char* m_GoogleLanguage; std::string &url,
const std::string &from_lang,
const std::string &to_lang,
const std::string &text) const;
/*virtual*/ void getKeyVerificationURL(
std::string &url,
const std::string &key) const;
/*virtual*/ bool parseResponse(
int& status,
const std::string& body,
std::string& translation,
std::string& detected_lang,
std::string& err_msg) const;
/*virtual*/ bool isConfigured() const;
private:
static std::string getAPIKey();
static std::string getAPILanguageCode(const std::string& lang);
};
/**
* Entry point for machine translation services.
*
* Basically, to translate a string, we need to know the URL
* of a translation service, have a valid API for the service
* and be given the target language.
*
* Callers specify the string to translate and the target language,
* LLTranslate takes care of the rest.
*
* API keys for translation are taken from saved settings.
*/
class LLTranslate
{
LOG_CLASS(LLTranslate);
public :
typedef enum e_service {
SERVICE_BING,
SERVICE_GOOGLE,
} EService;
/**
* Subclasses are supposed to handle translation results (e.g. show them in chat)
*/
class TranslationReceiver: public LLHTTPClient::ResponderWithCompleted
{
public:
/**
* Using mHandler, parse incoming response.
*
* Calls either handleResponse() or handleFailure()
* depending on the HTTP status code and parsing success.
*
* @see handleResponse()
* @see handleFailure()
* @see mHandler
*/
/*virtual*/ void completedRaw(
const LLChannelDescriptors& channels,
const LLIOPipe::buffer_ptr_t& buffer);
protected:
friend class LLTranslate;
/// Remember source and target languages for subclasses to be able to filter inappropriate results.
TranslationReceiver(const std::string& from_lang, const std::string& to_lang);
virtual void result(LLSD const& content) {};
/// Override point to handle successful translation.
virtual void handleResponse(const std::string &translation, const std::string &recognized_lang) = 0;
/// Override point to handle unsuccessful translation.
virtual void handleFailure(int status, const std::string& err_msg) = 0;
std::string mFromLang;
std::string mToLang;
const LLTranslationAPIHandler& mHandler;
};
/**
* Subclasses are supposed to handle API key verification result.
*/
class KeyVerificationReceiver: public LLHTTPClient::ResponderWithCompleted
{
public:
EService getService() const;
protected:
virtual void result(LLSD const& content) {};
/**
* Save the translation service the key belongs to.
*
* Subclasses need to know it.
*
* @see getService()
*/
KeyVerificationReceiver(EService service);
/**
* Parse verification response.
*
* Calls setVerificationStatus() with the verification status,
* which is true if HTTP status code is 200.
*
* @see setVerificationStatus()
*/
/*virtual*/ void completedRaw(
const LLChannelDescriptors& channels,
const LLIOPipe::buffer_ptr_t& buffer);
/**
* Override point for subclasses to handle key verification status.
*/
virtual void setVerificationStatus(bool ok) = 0;
EService mService;
};
typedef boost::intrusive_ptr<TranslationReceiver> TranslationReceiverPtr;
typedef boost::intrusive_ptr<KeyVerificationReceiver> KeyVerificationReceiverPtr;
/**
* Translate given text.
*
* @param receiver Object to pass translation result to.
* @param from_lang Source language. Leave empty for auto-detection.
* @param to_lang Target language.
* @param mesg Text to translate.
*/
static void translateMessage(TranslationReceiverPtr &receiver, const std::string &from_lang, const std::string &to_lang, const std::string &mesg);
/**
* Verify given API key of a translation service.
*
* @param receiver Object to pass verification result to.
* @param key Key to verify.
*/
static void verifyKey(KeyVerificationReceiverPtr& receiver, const std::string& key);
/**
* @return translation target language
*/
static std::string getTranslateLanguage();
/**
* @return true if translation is configured properly.
*/
static bool isTranslationConfigured();
private:
static const LLTranslationAPIHandler& getPreferredHandler();
static const LLTranslationAPIHandler& getHandler(EService service);
static void sendRequest(const std::string& url, LLHTTPClient::ResponderPtr responder);
}; };
#endif #endif

97
indra/newview/llviewermessage.cpp
View File

@@ -91,6 +91,7 @@
#include "llimview.h" #include "llimview.h"
#include "llspeakers.h" #include "llspeakers.h"
#include "lltrans.h" #include "lltrans.h"
#include "lltranslate.h"
#include "llviewerfoldertype.h" #include "llviewerfoldertype.h"
#include "llviewergenericmessage.h" #include "llviewergenericmessage.h"
#include "llviewermenu.h" #include "llviewermenu.h"
@@ -3612,52 +3613,55 @@ void process_decline_callingcard(LLMessageSystem* msg, void**)
LLNotificationsUtil::add("CallingCardDeclined"); LLNotificationsUtil::add("CallingCardDeclined");
} }
#if 0 // Google translate doesn't work anymore
class ChatTranslationReceiver : public LLTranslate::TranslationReceiver class ChatTranslationReceiver : public LLTranslate::TranslationReceiver
{ {
public : public :
ChatTranslationReceiver(const std::string &fromLang, const std::string &toLang, LLChat *chat, ChatTranslationReceiver(const std::string &from_lang, const std::string &to_lang, const std::string &mesg,
const BOOL history) const LLChat &chat, const BOOL history)
: LLTranslate::TranslationReceiver(fromLang, toLang), : LLTranslate::TranslationReceiver(from_lang, to_lang),
m_chat(chat), m_chat(chat),
m_history(history) m_history(history),
m_origMesg(mesg)
{ {
} }
static boost::intrusive_ptr<ChatTranslationReceiver> build(const std::string &fromLang, const std::string &toLang, LLChat *chat, const BOOL history) static boost::intrusive_ptr<ChatTranslationReceiver> build(const std::string &from_lang, const std::string &to_lang, const std::string &mesg, const LLChat &chat, BOOL history)
{ {
return boost::intrusive_ptr<ChatTranslationReceiver>(new ChatTranslationReceiver(fromLang, toLang, chat, history)); return boost::intrusive_ptr<ChatTranslationReceiver>(new ChatTranslationReceiver(from_lang, to_lang, mesg, chat, history));
} }
protected: protected:
void handleResponse(const std::string &translation, const std::string &detectedLanguage) void handleResponse(const std::string &translation, const std::string &detected_language)
{ {
if (m_toLang != detectedLanguage) // filter out non-interesting responeses
m_chat->mText += " (" + translation + ")"; if ( !translation.empty()
&& (mToLang != detected_language)
&& (LLStringUtil::compareInsensitive(translation, m_origMesg) != 0) )
{
m_chat.mText += " (" + translation + ")";
}
add_floater_chat(*m_chat, m_history); add_floater_chat(m_chat, m_history);
delete m_chat;
} }
void handleFailure() void handleFailure(int status, const std::string& err_msg)
{ {
LLTranslate::TranslationReceiver::handleFailure(); llwarns << "Translation failed for mesg " << m_origMesg << " toLang " << mToLang << " fromLang " << mFromLang << llendl;
m_chat->mText += " (?)"; std::string msg = LLTrans::getString("TranslationFailed", LLSD().with("[REASON]", err_msg));
LLStringUtil::replaceString(msg, "\n", " "); // we want one-line error messages
m_chat.mText += " (" + msg + ")";
add_floater_chat(*m_chat, m_history); add_floater_chat(m_chat, m_history);
delete m_chat;
} }
/*virtual*/ char const* getName(void) const { return "ChatTranslationReceiver"; } /*virtual*/ char const* getName(void) const { return "ChatTranslationReceiver"; }
private: private:
LLChat *m_chat; LLChat m_chat;
const BOOL m_history; std::string m_origMesg;
BOOL m_history;
}; };
#endif
void add_floater_chat(const LLChat &chat, const BOOL history) void add_floater_chat(const LLChat &chat, const BOOL history)
{ {
@@ -3673,29 +3677,6 @@ void add_floater_chat(const LLChat &chat, const BOOL history)
} }
} }
#if 0 // Google translate doesn't work anymore
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)
{
// fromLang hardcoded to "" (autodetection) pending implementation of
// SVC-4879
const std::string &fromLang = "";
const std::string &toLang = LLTranslate::getTranslateLanguage();
LLChat *newChat = new LLChat(chat);
LLHTTPClient::ResponderPtr result = ChatTranslationReceiver::build(fromLang, toLang, newChat, history);
LLTranslate::translateMessage(result, fromLang, toLang, mesg);
}
else
{
add_floater_chat(chat, history);
}
}
#endif
// defined in llchatbar.cpp, but not declared in any header // defined in llchatbar.cpp, but not declared in any header
void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channel); void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channel);
@@ -4263,16 +4244,34 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
chat.mPosAgent = chatter->getPositionAgent(); chat.mPosAgent = chatter->getPositionAgent();
} }
// truth table:
// LINDEN MUTED BUSY OWNED_BY_YOU TASK DISPLAY STORE IN HISTORY
// F T * * * No No
// F F T F * No Yes
// * F F * * Yes Yes
// * F * T * Yes Yes
// T * * * F Yes Yes
chat.mMuted = is_muted && !is_linden; chat.mMuted = is_muted && !is_linden;
bool only_history = visible_in_chat_bubble || (!is_linden && !is_owned_by_me && is_do_not_disturb); bool only_history = visible_in_chat_bubble || (!is_linden && !is_owned_by_me && is_do_not_disturb);
#if 0 // Google translate doesn't work anymore
if (!chat.mMuted) if (!chat.mMuted)
{ {
check_translate_chat(mesg, chat, only_history); LLSD args;
if (chat.mSourceType != CHAT_SOURCE_SYSTEM && gSavedSettings.getBOOL("TranslateChat"))
{
if (ircstyle)
{
mesg.erase(4);
}
const std::string from_lang = ""; // leave empty to trigger autodetect
const std::string to_lang = LLTranslate::getTranslateLanguage();
LLTranslate::TranslationReceiverPtr result = ChatTranslationReceiver::build(from_lang, to_lang, mesg, chat, only_history);
LLTranslate::translateMessage(result, from_lang, to_lang, mesg);
return;
}
} }
#else
add_floater_chat(chat, only_history); add_floater_chat(chat, only_history);
#endif
} }
} }

2
indra/newview/skins/default/xui/en-us/floater_chat_history.xml
View File

@@ -16,7 +16,7 @@
<combo_item name="Gestures">Gestures</combo_item> <combo_item name="Gestures">Gestures</combo_item>
</combo_box> </combo_box>
<check_box bottom_delta="-2" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Show Muted Text" left_delta="124" name="show mutes" width="116"/> <check_box bottom_delta="-2" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Show Muted Text" left_delta="124" name="show mutes" width="116"/>
<!--check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Translate Chat (powered by Google)" name="translate chat" width="100" control_name="TranslateChat"/--> <check_box bottom_delta="-12" follows="left|top" height="20" label="Translate chat" name="translate chat" width="100"/>
<button bottom_delta="2" left_delta="120" follows="left|top" font="SansSerifSmall" height="20" width="100" label="Open History" name="chat_history_open" tool_tip="Click here to open chat history in external editor."/> <button bottom_delta="2" left_delta="120" follows="left|top" font="SansSerifSmall" height="20" width="100" label="Open History" name="chat_history_open" tool_tip="Click here to open chat history in external editor."/>
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" toggle="true" left="272" name="toggle_active_speakers_btn" right="305" tool_tip="Click here to show a list of active participants in this IM session." width="80"/> <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" toggle="true" left="272" name="toggle_active_speakers_btn" right="305" tool_tip="Click here to show a list of active participants in this IM session." width="80"/>
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="0" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="107" left="5" max_length="2147483647" name="Chat History Editor" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/> <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="0" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="107" left="5" max_length="2147483647" name="Chat History Editor" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>

1
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
View File

@@ -196,5 +196,6 @@ To use spellcheck, right-click a misspelled word
<line_editor bottom_delta="-20" follows="left|top" bevel_style="in" border_style="line" border_thickness="1" height="20" left_delta="-5" max_length="36" name="KeywordsSound" width="300"/> <line_editor bottom_delta="-20" follows="left|top" bevel_style="in" border_style="line" border_thickness="1" height="20" left_delta="-5" max_length="36" name="KeywordsSound" width="300"/>
</panel> </panel>
<panel border="true" left="1" bottom="-408" height="408" width="500" filename="panel_translation_settings.xml" label="Translation" name="Translation Panel"/>
</tab_container> </tab_container>
</panel> </panel>

51
indra/newview/skins/default/xui/en-us/panel_translation_settings.xml Normal file
View File

@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel height="310" name="panel_translation_settings" title="Translation" width="485">
<string name="bing_api_key_not_verified">Bing appID not verified. Please try again.</string>
<string name="google_api_key_not_verified">Google API key not verified. Please try again.</string>
<string name="bing_api_key_verified">Bing appID verified.</string>
<string name="google_api_key_verified">Google API key verified.</string>
<check_box label="Enable machine translation while chatting" left="5" name="translate_chat_checkbox" control_name="TranslateChat" bottom="-30" width="20"/>
<text follows="left|top" left="20" bottom_delta="-20" name="translate_language_label">Translate chat into: </text>
<combo_box allow_text_entry="true" follows="left|top" height="20" max_chars="135" name="translate_language_combo" control_name="TranslateLanguage" bottom_delta="-6" left_delta="100" width="190">
<combo_item name="System Default Language" value="default">System Default</combo_item>
<combo_item name="English" value="en">English</combo_item>
<!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
<combo_item name="Danish" value="da">Dansk (Danish)</combo_item>
<combo_item name="German" value="de">Deutsch (German)</combo_item>
<combo_item name="Spanish" value="es">Español (Spanish)</combo_item>
<combo_item name="French" value="fr">Français (French)</combo_item>
<combo_item name="Italian" value="it">Italiano (Italian)</combo_item>
<combo_item name="Hungarian" value="hu">Magyar (Hungarian)</combo_item>
<combo_item name="Dutch" value="nl">Nederlands (Dutch)</combo_item>
<combo_item name="Polish" value="pl">Polski (Polish)</combo_item>
<combo_item name="Portugese" value="pt">Português (Portuguese)</combo_item>
<combo_item name="Russian" value="ru">Русский (Russian)</combo_item>
<combo_item name="Turkish" value="tr">Türkçe (Turkish)</combo_item>
<combo_item name="Ukrainian" value="uk">Українська (Ukrainian)</combo_item>
<combo_item name="Chinese" value="zh">中文 (正體) (Chinese)</combo_item>
<combo_item name="Japanese" value="ja">日本語 (Japanese)</combo_item>
<combo_item name="Korean" value="ko">한국어 (Korean)</combo_item>
</combo_box>
<text follows="top|left|right" left="20" bottom_delta="-18" name="tip">Choose translation service:</text>
<radio_group draw_border="false" follows="top|left" bottom_delta="-7" left_delta="160" height="20" width="300" name="translation_service_rg" control_name="TranslationService">
<radio_item value="bing" name="bing" bottom="0" left="0" height="20">Bing Translator</radio_item>
<radio_item value="google" name="google" bottom="0" left_delta="60">Google Translate</radio_item>
</radio_group>
<text_editor enabled="false" font="SansSerifSmall" hide_scrollbar="true" hide_border="true" bg_readonly_color="0 0 0 0" follows="top|right" height="20" width="109" bottom_delta="-24" left="5" name="bing_api_key_label">
Bing
</text_editor>
<line_editor label="Enter Bing AppID and click &quot;Verify&quot;" follows="top|left" height="20" bottom_delta="0" left_delta="105" max_length_chars="50" top_delta="-4" name="bing_api_key" control_name="BingTranslateAPIKey" width="210"/>
<button follows="left|top" height="20" label="Verify" bottom_delta="0" left_delta="215" name="verify_bing_api_key_btn" width="80"/>
<text_editor enabled="false" font="SansSerifSmall" hide_scrollbar="true" hide_border="true" bg_readonly_color="0 0 0 0" follows="top|right" height="20" bottom_delta="0" width="109" left="5" name="google_api_key_label">
Google
</text_editor>
<line_editor label="Enter Google API key and click &quot;Verify&quot;" follows="top|left" height="20" bottom_delta="0" left_delta="105" max_length_chars="50" top_delta="-4" name="google_api_key" control_name="GoogleTranslateAPIKey" width="210"/>
<button follows="left|top" height="20" label="Verify" bottom_delta="0" left_delta="215" name="verify_google_api_key_btn" width="80"/>
<text_editor enabled="false" font="SansSerifSmall" hide_scrollbar="true" hide_border="true" bg_readonly_color="0 0 0 0" follows="top|right" height="20" left_delta="70" name="google_links_text" bottom_delta="0"/>
<string name="Pricing">Pricing</string>
<string name="Stats">Stats</string>
</panel>