widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands.

Commit message:
- Fixed numbering inconsistency in production program strings.

- Fixed Purpose helptext for Battle Ax.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
  https://bugs.launchpad.net/widelands/+bug/1421942
  Bug #1487887 in widelands: "Translation missing in editor and in replay tooltip"
  https://bugs.launchpad.net/widelands/+bug/1487887
  Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the battle ax"
  https://bugs.launchpad.net/widelands/+bug/1530240
  Bug #1530398 in widelands: "Wrong text above marble mine"
  https://bugs.launchpad.net/widelands/+bug/1530398

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/283712

2 string fixes - see commit message.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-fixes into lp:widelands.

=== modified file 'src/logic/map_objects/tribes/production_program.cc'
--- src/logic/map_objects/tribes/production_program.cc	2016-01-14 22:09:24 +0000
+++ src/logic/map_objects/tribes/production_program.cc	2016-01-23 10:26:46 +0000
@@ -1055,7 +1055,7 @@
 		count += item_pair.second;
 		std::string ware_descname = tribe.get_ware_descr(item_pair.first)->descname();
 		// TODO(GunChleoc): would be nice with pngettext whenever it gets added to xgettext for Lua.
-		if (1 < count) {
+		if (1 < item_pair.second || 1 < produced_wares_.size()) {
 			/** TRANSLATORS: This is an item in a list of wares, e.g. "Produced 2x Coal": */
 			/** TRANSLATORS:    %%1$i = "2" */
 			/** TRANSLATORS:    %2$s = "Coal" */
@@ -1151,7 +1151,7 @@
 		count += item_pair.second;
 		std::string worker_descname = tribe.get_worker_descr(item_pair.first)->descname();
 		// TODO(GunChleoc): would be nice with pngettext whenever it gets added to xgettext for Lua.
-		if (1 < count) {
+		if (1 < item_pair.second || 1 < recruited_workers_.size()) {
 			/** TRANSLATORS: This is an item in a list of workers, e.g. "Recruited 2x Ox": */
 			/** TRANSLATORS:    %1$i = "2" */
 			/** TRANSLATORS:    %2$s = "Ox" */

=== modified file 'tribes/wares/ax_battle/helptexts.lua'
--- tribes/wares/ax_battle/helptexts.lua	2015-11-08 15:47:14 +0000
+++ tribes/wares/ax_battle/helptexts.lua	2016-01-23 10:26:46 +0000
@@ -1,7 +1,7 @@
 function ware_helptext(tribe)
    local helptext = {
       -- TRANSLATORS: Helptext for a ware: Battle Ax
-      barbarians = pgettext("barbarians_ware", "This is a dangerous weapon the Barbarians are able to produce. It is produced in the ax workshop. Only trained soldiers are able to wield such a weapon. It is used – together with food – in the training camp to train soldiers from attack level 3 to 4.")
+      barbarians = pgettext("barbarians_ware", "This is a dangerous weapon the Barbarians are able to produce. It is produced in the war mill. Only trained soldiers are able to wield such a weapon. It is used – together with food – in the training camp to train soldiers from attack level 3 to 4.")
    }
    local result = ""
    if tribe then