Finish previous commit (selected wrong search scope modifier in eclipse yesterday).

This was SVN commit r19014.
This commit is contained in:
elexis 2016-11-30 15:35:06 +00:00
parent 5e92a139f5
commit b60f26983c
2 changed files with 4 additions and 4 deletions

View file

@ -413,7 +413,7 @@ function displayMultiple(entStates)
"details": bodyFont(Object.keys(totalCarrying).filter(
res => totalCarrying[res] != 0).map(
res => sprintf(translate("%(type)s %(amount)s"),
{ "type": costIcon(res), "amount": totalCarrying[res] })).join(" "))
{ "type": resourceIcon(res), "amount": totalCarrying[res] })).join(" "))
});
if (Object.keys(totalLoot).length)
@ -422,7 +422,7 @@ function displayMultiple(entStates)
"details": bodyFont(Object.keys(totalLoot).filter(
res => totalLoot[res] != 0).map(
res => sprintf(translate("%(type)s %(amount)s"),
{ "type": costIcon(res), "amount": totalLoot[res] })).join(" "))
{ "type": resourceIcon(res), "amount": totalLoot[res] })).join(" "))
});
// Unhide Details Area

View file

@ -693,7 +693,7 @@ g_SelectionPanels.Queue = {
{
tooltip += "\n[color=\"red\"]" + translate("Insufficient population capacity:") + "\n[/color]";
tooltip += sprintf(translate("%(population)s %(neededSlots)s"), {
"population": costIcon("population"),
"population": resourceIcon("population"),
"neededSlots": data.item.neededSlots
});
}
@ -942,7 +942,7 @@ g_SelectionPanels.Selection = {
let tooltip = getEntityNames(template);
if (data.carried)
tooltip += "\n" + Object.keys(data.carried).map(res =>
costIcon(res) + data.carried[res]
resourceIcon(res) + data.carried[res]
).join(" ");
if (g_IsObserver)
tooltip += "\n" + sprintf(translate("Player: %(playername)s"), {