From fb5e7389203aef40ff3f2ef378202bc96c6d61e4 Mon Sep 17 00:00:00 2001
From: elexis <elexis@wildfiregames.com>
Date: Tue, 14 Jun 2016 12:17:37 +0000
Subject: [PATCH] Lobby cleanup. Patch by scythetwirler, refs #3865.

Replace an ugly workaround of ccb534259d with a proper check.

This was SVN commit r18375.
---
 binaries/data/mods/public/gui/lobby/lobby.js | 21 +++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/binaries/data/mods/public/gui/lobby/lobby.js b/binaries/data/mods/public/gui/lobby/lobby.js
index d470a926ef..8c06adfef4 100644
--- a/binaries/data/mods/public/gui/lobby/lobby.js
+++ b/binaries/data/mods/public/gui/lobby/lobby.js
@@ -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 });
 	}