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

Merge

master
Cinders 2013-07-31 01:48:19 -06:00
parent 4e058840af 49d6305bb5
commit 0803a761b2
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/fschathistory.cpp
View File

@ -88,11 +88,11 @@ std::string prefixIM(std::string from, const LLChat& chat)
{
if (chat.mChatType == CHAT_TYPE_IM)
{
from = LLTrans::getString("IMPrefix") + from;
from = LLTrans::getString("IMPrefix") + " " + from;
}
else if (chat.mChatType == CHAT_TYPE_IM_GROUP)
{
from = LLTrans::getString("IMPrefix") + chat.mFromNameGroup + from;
from = LLTrans::getString("IMPrefix") + " " + chat.mFromNameGroup + from;
}
return from;
@ -661,7 +661,7 @@ private:
mFrom = "";
if (chat_type == CHAT_TYPE_IM || chat_type == CHAT_TYPE_IM_GROUP)
{
mFrom = LLTrans::getString("IMPrefix");
mFrom = LLTrans::getString("IMPrefix") + " ";
if(!group.empty())
{
mFrom.append(group);
@ -1116,7 +1116,7 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
mLastFromName = chat.mFromName;
//if (chat.mChatType == CHAT_TYPE_IM) mLastFromName = LLTrans::getString("IMPrefix") + mLastFromName;
//if (chat.mChatType == CHAT_TYPE_IM) mLastFromName = LLTrans::getString("IMPrefix") + " " + mLastFromName;
mLastFromName = prefixIM(mLastFromName, chat);
mLastFromID = chat.mFromID;
mLastMessageTime = new_message_time;

2
indra/newview/fsconsoleutils.cpp
View File

@ -283,6 +283,6 @@ void FSConsoleUtils::onProccessInstantMessageNameLookup(const LLUUID& agent_id,
textColor = LGGContactSets::getInstance()->getFriendColor(agent_id);
}
gConsole->addConsoleLine(LLTrans::getString("IMPrefix") + senderName + delimiter + message, textColor);
gConsole->addConsoleLine("IM: " + senderName + delimiter + message, textColor);
gConsole->setVisible(!isNearbyChatVisible());
}

7
indra/newview/fsfloaternearbychat.cpp
View File

@ -293,13 +293,14 @@ void FSFloaterNearbyChat::addMessage(const LLChat& chat,bool archive,const LLSD
{
if (gSavedSettings.getBOOL("FSLogIMInChatHistory"))
{
//from_name = "IM: " + from_name;
if (chat.mChatType == CHAT_TYPE_IM_GROUP && chat.mFromNameGroup != "")
{
from_name = LLTrans::getString("IMPrefix") + chat.mFromNameGroup + from_name;
from_name = "IM: " + chat.mFromNameGroup + from_name;
}
else
{
from_name = LLTrans::getString("IMPrefix") + from_name;
from_name = "IM: " + from_name;
}
// FS:LO FIRE-5230 - Chat Console Improvement: Replacing the "IM" in front of group chat messages with the actual group name
}
@ -599,7 +600,7 @@ void FSFloaterNearbyChat::loadHistory()
// Ansariel: Strip IM prefix so we can properly
// retrieve the UUID in case we got a
// saved IM in nearby chat history.
std::string im_prefix = LLTrans::getString("IMPrefix");
std::string im_prefix = "IM: ";
size_t im_prefix_found = from.find(im_prefix);
if (im_prefix_found != std::string::npos)
{

2
indra/newview/lllogchat.cpp
View File

@ -797,7 +797,7 @@ bool LLChatLogParser::parse(std::string& raw, LLSD& im, const LLSD& parse_params
std::string name = name_and_text[IDX_NAME];
// Ansariel: Handle the case an IM was stored in nearby chat history
if (name == LLTrans::getString("IMPrefix"))
if (name == "IM:")
{
U32 divider_pos = stuff.find(NAME_TEXT_DIVIDER, 3);
if (divider_pos != std::string::npos && divider_pos < (stuff.length() - NAME_TEXT_DIVIDER.length()))

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

@ -2409,7 +2409,7 @@ Try enclosing path to the editor with double quotes.
<string name="snapshot_quality_medium">Medium</string>
<string name="snapshot_quality_high">High</string>
<string name="snapshot_quality_very_high">Very High</string>
<string name="IMPrefix">IM: </string>
<string name="IMPrefix">IM:</string>
<!-- Settings sanity checks -->
<string name="SanityCheckEquals">The settings control &quot;[CONTROL_NAME]&quot; should be at [VALUE_1].</string>

2
indra/newview/skins/default/xui/es/strings.xml
View File

@ -5357,7 +5357,7 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
No hay conversaciones guardadas. Después de contactar con un residente o de que alguien contacte contigo, se mostrará aquí una entrada de registro.
</string>
<string name="IMPrefix">
MI:
MI:
</string>
<string name="SanityCheckEquals">
La configuración de &quot;[CONTROL_NAME]&quot; debería establecerse a [VALUE_1].