dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Lobby cleanup. Patch by scythetwirler, refs #3865.

Browse source 
Replace an ugly workaround of ccb534259d with a proper check.

This was SVN commit r18375.
This commit is contained in:
elexis 2016-06-14 12:17:37 +00:00
parent 949f22b67d
commit fb5e738920
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
binaries/data/mods/public/gui/lobby/lobby.js
View file

@ -63,6 +63,11 @@ const g_PlayerStatuses = {
*/
const g_SystemColor = "150 0 0";
/**
* Color for private messages in the chat.
*/
const g_PrivateMessageColor = "0 150 0";
/**
* Used for highlighting the sender of chat messages.
*/
@ -165,9 +170,10 @@ var g_NetMessageTypes = {
"private-message": msg => {
if (Engine.LobbyGetPlayerRole(msg.from) == "moderator")
addChatMessage({
"from": "(Private) " + escapeText(msg.from), // TODO: placeholder
"from": escapeText(msg.from),
"text": escapeText(msg.text.trim()), // some XMPP clients send trailing whitespace
"datetime": msg.datetime
"datetime": msg.datetime,
"private" : true
});
}
},
@ -889,7 +895,16 @@ function ircFormat(msg)
else
{
// Translation: IRC message prefix.
senderString = '[font="' + g_SenderFont + '"]' + sprintf(translate("<%(sender)s>"), { "sender": coloredFrom }) + '[/font]';
if (msg.private)
senderString = sprintf(translateWithContext("lobby private message", "(%(private)s) <%(sender)s>"), {
"private": '[color="' + g_PrivateMessageColor + '"]' + translate("Private") + '[/color]',
"sender": coloredFrom
});
else
senderString = sprintf(translate("<%(sender)s>"), { "sender": coloredFrom });
senderString = '[font="' + g_SenderFont + '"]' + senderString + '[/font]';
// Translation: IRC message.
formattedMessage = sprintf(translate("%(sender)s %(message)s"), { "sender": senderString, "message": msg.text });
}