Merge lp:~widelands-dev/widelands/bug-1505723 into lp:widelands

[GunChleoc]

Added new performance calculations to help files.

[GunChleoc (gunchleoc)]

Removed some crud from the diff.

review: Needs Resubmitting

[TiborB (tiborb95)]

LGTM

review: Approve

=== modified file 'tribes/buildings/productionsites/atlanteans/blackroot_farm/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/blackroot_farm/helptexts.lua	2015-11-07 08:45:50 +0000
+++ tribes/buildings/productionsites/atlanteans/blackroot_farm/helptexts.lua	2015-11-21 10:36:05 +0000
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
-   return no_performance_text_yet()
+   -- TRANSLATORS: Performance helptext for a building
+   return pgettext("atlanteans_building", "The blackroot farmer needs %1% on average to sow and harvest a bundle of blackroot."):bformat(format_minutes_seconds(1, 20))
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/farm/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/farm/helptexts.lua	2015-11-08 13:59:37 +0000
+++ tribes/buildings/productionsites/atlanteans/farm/helptexts.lua	2015-11-21 10:36:05 +0000
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
-   return no_performance_text_yet()
+   -- TRANSLATORS: Performance helptext for a building
+   return pgettext("atlanteans_building", "The farmer needs %1% on average to sow and harvest a sheaf of corn."):bformat(format_minutes_seconds(1, 20))
 end

=== modified file 'tribes/buildings/productionsites/barbarians/farm/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/farm/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/barbarians/farm/helptexts.lua	2015-11-21 10:36:05 +0000
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
-   return no_performance_text_yet()
+   -- TRANSLATORS: Performance helptext for a building
+   return pgettext("barbarians_building", "The farmer needs %1% on average to sow and harvest a sheaf of wheat."):bformat(format_minutes_seconds(1, 40))
 end

=== modified file 'tribes/buildings/productionsites/empire/bakery/helptexts.lua'
--- tribes/buildings/productionsites/empire/bakery/helptexts.lua	2015-11-08 11:35:51 +0000
+++ tribes/buildings/productionsites/empire/bakery/helptexts.lua	2015-11-21 10:36:05 +0000
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
-   return no_performance_text_yet()
+   -- TRANSLATORS: Performance helptext for a building
+   return pgettext("empire_building", "The baker needs %1% on average to bake a loaf of bread."):bformat(format_seconds(34))
 end

=== modified file 'tribes/buildings/productionsites/empire/brewery/helptexts.lua'
--- tribes/buildings/productionsites/empire/brewery/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/brewery/helptexts.lua	2015-11-21 10:36:05 +0000
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
-   return no_performance_text_yet()
+   -- TRANSLATORS: Performance helptext for a building
+   return pgettext("empire_building", "The brewer needs %1% on average to brew a vat of beer."):bformat(format_minutes_seconds(1, 5))
 end

=== modified file 'tribes/buildings/productionsites/empire/farm/helptexts.lua'
--- tribes/buildings/productionsites/empire/farm/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/farm/helptexts.lua	2015-11-21 10:36:05 +0000
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
-   return no_performance_text_yet()
+   -- TRANSLATORS: Performance helptext for a building
+   return pgettext("empire_building", "The farmer needs %1% on average to sow and harvest a sheaf of wheat."):bformat(format_minutes_seconds(1, 20))
 end

=== modified file 'tribes/buildings/productionsites/empire/inn/helptexts.lua'
--- tribes/buildings/productionsites/empire/inn/helptexts.lua	2015-11-08 11:35:51 +0000
+++ tribes/buildings/productionsites/empire/inn/helptexts.lua	2015-11-21 10:36:05 +0000
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
-   return no_performance_text_yet()
+   -- TRANSLATORS: Performance helptext for a building
+   return pgettext("empire_building", "The innkeeper needs %1% on average to prepare a ration and a meal. If the economy doesn’t need both, the innkeeper needs %2% on average to prepare one ration or one meal."):bformat(format_minutes_seconds(1, 25), format_seconds(48))
 end

=== modified file 'tribes/buildings/productionsites/empire/mill/helptexts.lua'
--- tribes/buildings/productionsites/empire/mill/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/mill/helptexts.lua	2015-11-21 10:36:05 +0000
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
-   return no_performance_text_yet()
+   -- TRANSLATORS: Performance helptext for a building
+   return pgettext("empire_building", "The miller needs %1% on average to grind wheat into a sack of corn."):bformat(format_seconds(19))
 end

=== modified file 'tribes/buildings/productionsites/empire/piggery/helptexts.lua'
--- tribes/buildings/productionsites/empire/piggery/helptexts.lua	2015-11-08 11:35:51 +0000
+++ tribes/buildings/productionsites/empire/piggery/helptexts.lua	2015-11-21 10:36:05 +0000
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
-   return no_performance_text_yet()
+   -- TRANSLATORS: Performance helptext for a building
+   return pgettext("empire_building", "The pig breeder needs %1% on average to raise and slaughter a pig."):bformat(format_minutes(1))
 end

=== modified file 'tribes/buildings/productionsites/empire/tavern/helptexts.lua'
--- tribes/buildings/productionsites/empire/tavern/helptexts.lua	2015-11-08 11:35:51 +0000
+++ tribes/buildings/productionsites/empire/tavern/helptexts.lua	2015-11-21 10:36:05 +0000
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
-   return no_performance_text_yet()
+   -- TRANSLATORS: Performance helptext for a building
+   return pgettext("empire_building", "The innkeeper needs %1% on average to prepare a ration."):bformat(format_seconds(36))
 end

=== modified file 'tribes/scripting/help/global_helptexts.lua'
--- tribes/scripting/help/global_helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/scripting/help/global_helptexts.lua	2015-11-21 10:36:05 +0000
@@ -45,3 +45,43 @@
    -- TRANSLATORS: Performance helptext for a building - it hasn't been written yet.
    return _"Calculation needed"
 end
+
+-- RST
+-- .. function:: format_seconds(seconds)
+--
+--    :arg seconds: number of seconds
+--
+--    Returns a localized string to tell the time in seconds with the proper plural form.
+--    :returns: "1 second", or "20 seconds" etc.
+--
+function format_seconds(seconds)
+   return ngettext("%d second", "%d seconds", seconds):bformat(seconds)
+end
+
+-- RST
+-- .. function:: format_minutes(minutes)
+--
+--    :arg minutes: number of minutes
+--
+--    Returns a localized string to tell the time in minutes with the proper plural form.
+--    :returns: "1 minute", or "20 minutes" etc.
+--
+function format_minutes(minutes)
+   return ngettext("%d minute", "%d minutes", minutes):bformat(minutes)
+end
+
+-- RST
+-- .. function:: format_minutes_seconds(minutes, seconds)
+--
+--    :arg minutes: number of minutes
+--    :arg seconds: number of seconds
+--
+--    Returns a localized string to tell the time in minutes and seconds with the proper plural form.
+--    :returns: "1 minute and 20 seconds" etc.
+--
+function format_minutes_seconds(minutes, seconds)
+   return _("%1% and %2%"):bformat(
+      ngettext("%d minute", "%d minutes", minutes):bformat(minutes),
+      ngettext("%d second", "%d seconds", seconds):bformat(seconds)
+   )
+end