Index: ps/trunk/binaries/data/mods/public/gui/common/l10n.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/l10n.js
+++ ps/trunk/binaries/data/mods/public/gui/common/l10n.js
@@ -1,24 +0,0 @@
-/**
- * Format resource amounts to proper english and translate (for example: "200 food, 100 wood, and 300 metal").
- */
-function getLocalizedResourceAmounts(resources)
-{
- let amounts = g_ResourceData.GetCodes()
- .filter(type => !!resources[type])
- .map(type => sprintf(translate("%(amount)s %(resourceType)s"), {
- "amount": resources[type],
- "resourceType": resourceNameWithinSentence(type)
- }));
-
- if (amounts.length > 1)
- {
- let lastAmount = amounts.pop();
- amounts = sprintf(translate("%(previousAmounts)s and %(lastAmount)s"), {
- // Translation: This comma is used for separating first to penultimate elements in an enumeration.
- "previousAmounts": amounts.join(translate(", ")),
- "lastAmount": lastAmount
- });
- }
-
- return amounts;
-}
Index: ps/trunk/binaries/data/mods/public/gui/common/tooltips.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/tooltips.js
+++ ps/trunk/binaries/data/mods/public/gui/common/tooltips.js
@@ -57,6 +57,29 @@
return translateWithContext("withinSentence", g_ResourceData.GetNames()[type]);
}
+/**
+ * Format resource amounts to proper english and translate (for example: "200 food, 100 wood and 300 metal").
+ */
+function getLocalizedResourceAmounts(resources)
+{
+ let amounts = g_ResourceData.GetCodes()
+ .filter(type => !!resources[type])
+ .map(type => sprintf(translate("%(amount)s %(resourceType)s"), {
+ "amount": resources[type],
+ "resourceType": resourceNameWithinSentence(type)
+ }));
+
+ if (amounts.length < 2)
+ return amounts.join();
+
+ let lastAmount = amounts.pop();
+ return sprintf(translate("%(previousAmounts)s and %(lastAmount)s"), {
+ // Translation: This comma is used for separating first to penultimate elements in an enumeration.
+ "previousAmounts": amounts.join(translate(", ")),
+ "lastAmount": lastAmount
+ });
+}
+
function bodyFont(text)
{
return g_TooltipTextFormats.body[0] + text + g_TooltipTextFormats.body[1];
Index: ps/trunk/binaries/data/mods/public/gui/session/session.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/session.xml
+++ ps/trunk/binaries/data/mods/public/gui/session/session.xml
@@ -8,7 +8,6 @@
-