Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Session cleanup.

Browse Source 
Remove a pointless conditional operator (which had been introduced with
the other format-message functions that distinguish more strings).
Remove unneeded parenthesis and try once more to align this if-statement
properly.

This was SVN commit r18147.
This commit is contained in:
elexis 2016-05-09 01:00:34 +00:00
parent b45e3e46f7
commit 18e9c4e558
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
binaries/data/mods/public/gui/session/messages.js
View File

@ -653,11 +653,10 @@ function colorizePlayernameHelper(username, playerID)
function formatDefeatMessage(msg)
{
// In singleplayer, the local player is "You". "You has" is incorrect.
let message = !g_IsNetworked && msg.player == Engine.GetPlayerID() ?
translate("You have been defeated.") :
translate("%(player)s has been defeated.");
if (!g_IsNetworked && msg.player == Engine.GetPlayerID())
return translate("You have been defeated.");
return sprintf(message, {
return sprintf(translate("%(player)s has been defeated."), {
"player": colorizePlayernameByID(msg.player)
});
}
@ -814,7 +813,7 @@ function parseChatAddressee(msg)
// For observers only permit public- and observer-chat and PM to observers
if (isPlayerObserver(senderID) &&
((isPM && !isPlayerObserver(addresseeIndex)) || (!isPM && cmd != "/observers")))
(isPM && !isPlayerObserver(addresseeIndex) || !isPM && cmd != "/observers"))
return false;
return isSender || g_IsChatAddressee[cmd](senderID, addresseeGUID);