From d856f1ea9516f6d852dca56f16e08266747e3e96 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Thu, 18 Mar 2010 15:44:31 +0200
Subject: [PATCH] =?UTF-8?q?Low=20task=20(EXT-6261)=20[HARD=20CODED]=20Abus?=
=?UTF-8?q?e=20Report:=20After=20sending=20an=20abuse=20report,=20there=20?=
=?UTF-8?q?is=20a=20popup=20window=20stating=20that=20the=20report=20is=20?=
=?UTF-8?q?sent/uploaded.=20The=20window=20isn=C2=B4t=20localized.=20-=20R?=
=?UTF-8?q?emoved=20hardcoded=20string.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Reviewed by Richard Nelson https://codereview.productengine.com/secondlife/r/23/
--HG--
branch : product-engine
---
indra/newview/llfloaterreporter.cpp | 5 +++--
indra/newview/skins/default/xui/en/strings.xml | 3 +++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index 0f3c176cead..42a7eeff26c 100644
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -84,6 +84,8 @@
#include "llassetuploadresponders.h"
#include "llagentui.h"
+#include "lltrans.h"
+
const U32 INCLUDE_SCREENSHOT = 0x01 << 0;
//-----------------------------------------------------------------------------
@@ -372,8 +374,7 @@ void LLFloaterReporter::onClickSend(void *userdata)
return;
}
-
- LLUploadDialog::modalUploadDialog("Uploading...\n\nReport");
+ LLUploadDialog::modalUploadDialog(LLTrans::getString("uploading_abuse_report"));
// *TODO don't upload image if checkbox isn't checked
std::string url = gAgent.getRegion()->getCapability("SendUserReport");
std::string sshot_url = gAgent.getRegion()->getCapability("SendUserReportWithScreenshot");
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c6d9e79267d..d24873e9e6e 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3070,4 +3070,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="group_role_officers">Officers</string>
<string name="group_role_owners">Owners</string>
+ <string name="uploading_abuse_report">Uploading...
+
+Abuse Report</string>
</strings>
--
GitLab