Ticket #3409: t3409_v1.patch

ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -46 +46 @@
     "banned": (msg, user) => systemMessage(sprintf(translate("%(username)s has been banned"), { "username": user })),
     "chat": (msg, user) => sprintf(translate("%(username)s %(message)s"), {
         "username": senderFont(sprintf(translate("<%(username)s>"), { "username": user })),
-        "message": escapeText(msg.text || "")
+        "message": colorizePlayernameInWideText(msg.text || "")
     }),
     "ready": (msg, user) => sprintf(translate("* %(username)s is ready!"), {
         "username": user
@@ -213 +213 @@
         g_DefaultPlayerData[i].Civ = "random";
 }
 
+function colorizePlayernameInWideText(message)
+{   
+    var words = message.split( " " );
+    var colorizedNames = [];
+    var names = [];
+    var ret = "";
+    
+    for (let guid in g_PlayerAssignments)
+    {
+        let player = g_PlayerAssignments[guid];     
+        if (player.player > 0)
+        {           
+            colorizedNames.push( colorizePlayernameByGUID(guid,player.name) );
+            names.push( player.name );
+      }     
+        else
+        {
+            colorizedNames.push("");
+            names.push("");
+        }
+    }
+    
+    for(let currentWordIndex in words)
+    {
+        var colorizedNameIndex = names.indexOf( words[currentWordIndex] );
+        if( colorizedNameIndex != -1 )
+            ret = ret + " " + colorizedNames[colorizedNameIndex];
+        else
+            ret = ret + " " + escapeText( words[currentWordIndex] );
+    }
+    
+    return ret;
+}
+
 /**
  * Called after the first tick.
  */
@@ -1621 +1655 @@
     if (!username)
         username = g_PlayerAssignments[guid] ? escapeText(g_PlayerAssignments[guid].name) : translate("Unknown Player");
     let playerID = g_PlayerAssignments[guid] ? g_PlayerAssignments[guid].player : -1;
-
+    
     let color = "white";
     if (playerID > 0)
     {
@@ -1642 +1676 @@
     if (!g_FormatChatMessage[msg.type])
         return;
 
-    let user = colorizePlayernameByGUID(msg.guid || -1, msg.username || "");
+    let user = colorizePlayernameByGUID(msg.guid || -1, msg.username || "");    
 
     g_ChatMessages.push(g_FormatChatMessage[msg.type](msg, user));