Merge lp:~widelands-dev/widelands/bug1504952 into lp:widelands

[Jens Beyer]

Merge request since I don't know if simply adding _ macro is enough nowadays, and if it is necessary to do something else because of the new translation stuff :-)

[wl-zocker (wl-zocker)]

You could have done that in the other branch, too.

And I think that is all you need to do, but I am not definitely sure.

[Jens Beyer (qcumber-some)]

I could have done that, but after my being too eager with the other merge request, I am now pushing everything separately :-)

Regarding the new push... yes, I am really good at that "push first, compile later" game... but I usually stop before the "go on vacation" part ;-)

[GunChleoc (gunchleoc)]

Yes, the _ macro is perfectly fine.

We only need the fancy stuff if the string contains a number placeholder, or if we have a string that comes up multiple times, but we want to translate it separately ("None", "Unknown", "Yes", "No" and "Other" are prime candidates for those).

review: Approve

=== modified file 'src/logic/production_program.cc'
--- src/logic/production_program.cc	2015-10-02 07:02:00 +0000
+++ src/logic/production_program.cc	2015-10-11 15:19:15 +0000
@@ -814,7 +814,7 @@
 			if (game.map().allows_seafaring())
 				return ps.program_step(game, 0);
 			else {
-				ps.set_production_result("No use for ships on this map!");
+				ps.set_production_result(_("No use for ships on this map!"));
 				return ps.program_end(game, None);
 			}
 		}