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

Proposed by GunChleoc on 2019-02-10
Status: Merged
Merged at revision: 8977
Proposed branch: lp:~widelands-dev/widelands/string-fixes
Merge into: lp:widelands
Diff against target: 14 lines (+3/-1)
1 file modified
data/scripting/win_conditions/win_condition_functions.lua (+3/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/string-fixes
Reviewer Review Type Date Requested Status
Toni Förster 2019-02-10 Approve on 2019-02-10
Review via email: mp+362944@code.launchpad.net

Commit message

Fix pluralization error.

Description of the change

Not tested yet.

To post a comment you must log in.
Klaus Halfmann (klaus-halfmann) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/scripting/win_conditions/win_condition_functions.lua'
2--- data/scripting/win_conditions/win_condition_functions.lua 2019-02-09 15:38:59 +0000
3+++ data/scripting/win_conditions/win_condition_functions.lua 2019-02-10 11:37:22 +0000
4@@ -258,7 +258,9 @@
5
6 if ((h > 0) and (m > 0)) then
7 -- TRANSLATORS: Context: 'The game will end in 2 hours and 30 minutes.'
8- time = (ngettext("%1% hour and %2% minutes", "%1% hours and %2% minutes", h, m)):bformat(h, m)
9+ time = (ngettext("%i minute", "%i minutes", h, m)):bformat(m)
10+ -- TRANSLATORS: Context: 'The game will end in 2 hours and 30 minutes.'
11+ time = (ngettext("%1% hour and %2%", "%1% hours and %2%", h, m)):bformat(h, time)
12 elseif m > 0 then
13 -- TRANSLATORS: Context: 'The game will end in 30 minutes.'
14 time = (ngettext("%i minute", "%i minutes", m)):format(m)