livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-19209 Add default text for region field

meow-7.2.2
Andrey Kleshchev 2023-02-28 00:51:25 +02:00 committed by akleshchev
parent f7210db06e
commit b2a0690885
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfloatertranslationsettings.cpp
View File

@ -94,11 +94,11 @@ void LLFloaterTranslationSettings::onOpen(const LLSD& key)
mTranslationServiceRadioGroup->setSelectedByValue(gSavedSettings.getString("TranslationService"), TRUE);
LLSD azure_key = gSavedSettings.getLLSD("AzureTranslateAPIKey");
if (azure_key.isMap())
if (azure_key.isMap() && !azure_key["id"].asString().empty())
{
mAzureAPIKeyEditor->setText(azure_key["id"].asString());
mAzureAPIKeyEditor->setTentative(false);
if (azure_key.has("region"))
if (azure_key.has("region") && !azure_key["region"].asString().empty())
{
mAzureAPIRegionEditor->setText(azure_key["region"].asString());
mAzureAPIRegionEditor->setTentative(false);
@ -113,6 +113,7 @@ void LLFloaterTranslationSettings::onOpen(const LLSD& key)
else
{
mAzureAPIKeyEditor->setTentative(TRUE);
mAzureAPIRegionEditor->setTentative(true);
mAzureKeyVerified = FALSE;
}

4
indra/newview/lltranslate.cpp
View File

@ -229,8 +229,6 @@ void LLTranslationAPIHandler::translateMessageCoro(LanguagePair_t fromTo, std::s
LL_INFOS("Translate") << "No translation URL" << LL_ENDL;
return;
}
LL_DEBUGS("Translate") << "Message: " << msg << LL_ENDL;
LL_DEBUGS("Translate") << "Requesting: " << url << LL_ENDL;
LLSD result = sendMessageAndSuspend(httpAdapter, httpRequest, httpOpts, httpHeaders, url, msg);
@ -646,7 +644,7 @@ bool LLAzureTranslationHandler::checkVerificationResponse(
}
// Expected: "{\"error\":{\"code\":400000,\"message\":\"One of the request inputs is not valid.\"}}"
// But for now just verify response is a valid json with an error
// But for now just verify response is a valid json
Json::Value root;
Json::Reader reader;

1
indra/newview/skins/default/xui/en/floater_translation_settings.xml
View File

@ -246,6 +246,7 @@
Region:
</text>
<line_editor
default_text="Can be left empty for global services"
follows="top|left"
height="20"
layout="topleft"