Merge lp:~widelands-dev/widelands/string-fixes into lp:widelands

[GunChleoc]

Fix pluralization error.

Not tested yet.

[Klaus Halfmann (klaus-halfmann)]

Uhm, I dont find any changes for #1421942, #1487887, #1530240, #1547909 , #1530398

Bu only soem pluar in the wincondition.
Can we get the relations correct?

The actual fix is ok :-)

[Toni Förster (stonerl)]

Fix is okay, but as Klaus said. The related bugs don't fit. :-)

I'm going to remove them from the merge request.

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4450. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/491222019.
Appveyor build 4238. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-4238.

[GunChleoc (gunchleoc)]

The bugs are related to the branch because this is a permanent branch that I keep recycling. Just like the bugs that are linked to trunk, they should have remained linked.

@bunnybot merge

[Toni Förster (stonerl)]

:-( Sorry GunChleoc. I'm going to relink them later.

=== modified file 'data/scripting/win_conditions/win_condition_functions.lua'
--- data/scripting/win_conditions/win_condition_functions.lua	2019-02-09 15:38:59 +0000
+++ data/scripting/win_conditions/win_condition_functions.lua	2019-02-10 11:37:22 +0000
@@ -258,7 +258,9 @@
 
    if ((h > 0) and (m > 0)) then
       -- TRANSLATORS: Context: 'The game will end in 2 hours and 30 minutes.'
-      time = (ngettext("%1% hour and %2% minutes", "%1% hours and %2% minutes", h, m)):bformat(h, m)
+      time = (ngettext("%i minute", "%i minutes", h, m)):bformat(m)
+      -- TRANSLATORS: Context: 'The game will end in 2 hours and 30 minutes.'
+      time = (ngettext("%1% hour and %2%", "%1% hours and %2%", h, m)):bformat(h, time)
    elseif m > 0 then
       -- TRANSLATORS: Context: 'The game will end in 30 minutes.'
       time = (ngettext("%i minute", "%i minutes", m)):format(m)