Ticket #3252: t3252_fix_trade_tooltip.patch

File t3252_fix_trade_tooltip.patch, 1.7 KB (added by elexis, 9 years ago)

Fixes the two issues described above. (Attempts to use the correct playername, and succeeds if #3253 is committed).

  • binaries/data/mods/public/gui/session/utility_functions.js

     
    120120/**
    121121 * Returns a message with the details of the trade gain.
    122122 */
    123123function getTradingTooltip(gain)
    124124{
     125
     126    var playerID = Engine.GetPlayerID();
     127    var simState = GetSimState();
     128   
    125129    var gainString = gain.traderGain;
    126130    if (gain.market1Gain && gain.market1Owner == gain.traderOwner)
    127131        gainString += translate("+") + gain.market1Gain;
    128132    if (gain.market2Gain && gain.market2Owner == gain.traderOwner)
    129133        gainString += translate("+") + gain.market2Gain;
    130134
    131135    var tooltip = sprintf(translate("%(gain)s (%(player)s)"), {
    132136        gain: gainString,
    133         player: translate("you")
     137        player: gain.traderOwner == playerID ? translate("You") : simState.players[gain.traderOwner].name
    134138    });
    135139
    136140    if (gain.market1Gain && gain.market1Owner != gain.traderOwner)
    137141        tooltip += translate(", ") + sprintf(translate("%(gain)s (%(player)s)"), {
    138142            gain: gain.market1Gain,
    139             player: sprintf(translate("player %(name)s"), { name: gain.market1Owner })
     143            player: gain.market1Owner == playerID ? translate("You") : simState.players[gain.market1Owner].name
    140144        });
    141145    if (gain.market2Gain && gain.market2Owner != gain.traderOwner)
    142146        tooltip += translate(", ") + sprintf(translate("%(gain)s (%(player)s)"), {
    143147            gain: gain.market2Gain,
    144             player: sprintf(translate("player %(name)s"), { name: gain.market2Owner })
     148            player: gain.market2Owner == playerID ? translate("You") : simState.players[gain.market2Owner].name
    145149        });
    146150
    147151    return tooltip;
    148152}
    149153