diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 1 | 
2 files changed, 4 insertions, 1 deletions
| diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ff02214194..0eae6e6383 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3149,7 +3149,9 @@ protected:  	void handleFailure(int status, const std::string& err_msg)  	{ -		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 + ")";  		LLNotificationsUI::LLNotificationManager::instance().onChat(m_chat, m_toastArgs);  	} diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 146665b47d..f0bb82fdda 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3503,6 +3503,7 @@ Try enclosing path to the editor with double quotes.   <string name="ExternalEditorFailedToRun">External editor failed to run.</string>   <!--  Machine translation of chat messahes --> + <string name="TranslationFailed">Translation failed: [REASON]</string>   <string name="TranslationResponseParseError">Error parsing translation response.</string>    <!-- Key names begin --> | 
