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

Fixed normal bug EXT-6651 ([HARDCODE] System message in Nearby Chat window appears in EN) 

- Added instead of hardcoded string two strings to the strings.xml

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/294/

--HG--
branch : product-engine
master
Paul Guslisty 2010-04-23 07:46:34 +03:00
parent 52582f2e3e
commit 9166e7a8a0
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llviewermessage.cpp
View File

@ -1035,21 +1035,26 @@ bool check_offer_throttle(const std::string& from_name, bool check_only)
{
// Use the name of the last item giver, who is probably the person
// spamming you.
std::ostringstream message;
message << LLAppViewer::instance()->getSecondLifeTitle();
LLStringUtil::format_map_t arg;
std::string log_msg;
std::ostringstream time ;
time<<OFFER_THROTTLE_TIME;
arg["APP_NAME"] = LLAppViewer::instance()->getSecondLifeTitle();
arg["TIME"] = time.str();
if (!from_name.empty())
{
message << ": Items coming in too fast from " << from_name;
arg["FROM_NAME"] = from_name;
log_msg = LLTrans::getString("ItemsComingInTooFastFrom", arg);
}
else
{
message << ": Items coming in too fast";
log_msg = LLTrans::getString("ItemsComingInTooFast", arg);
}
message << ", automatic preview disabled for "
<< OFFER_THROTTLE_TIME << " seconds.";
//this is kinda important, so actually put it on screen
std::string log_msg = message.str();
LLSD args;
args["MESSAGE"] = log_msg;
LLNotificationsUtil::add("SystemMessage", args);

4
indra/newview/skins/default/xui/en/strings.xml
View File

@ -2933,6 +2933,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
Failed to start viewer
</string>
<!-- System Messages -->
<string name="ItemsComingInTooFastFrom">[APP_NAME]: Items coming in too fast from [FROM_NAME], automatic preview disabled for [TIME] seconds</string>
<string name="ItemsComingInTooFast">[APP_NAME]: Items coming in too fast, automatic preview disabled for [TIME] seconds</string>
<!-- IM system messages -->
<string name="IM_logging_string">-- Instant message logging enabled --</string>
<string name="IM_typing_start_string">[NAME] is typing...</string>