[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug_1480961_configure_economy into lp:widelands

2016-04-12 Thread bunnybot
Continuous integration builds have changed state: Travis build 1004. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/122593739. Appveyor build 837. State: failed. Details:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/test-ngettext into lp:widelands

2016-04-12 Thread Miroslav Remák
> Maybe we could write a wrapper that will map floating point numbers to the > appropriate integer numbers for the languages in our list, and then use those > integers to call ngettext? That wouldn't work for Slovak, because floats need their own, different form. There is nothing to map to. >

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/test-ngettext into lp:widelands

2016-04-12 Thread GunChleoc
The actual rule for Scottish Gaelic is to discard everything after the ., because we say "x seconds point y" for x.y seconds. Not having things correct for Slovak doesn't please me though. Maybe we could write a wrapper that will map floating point numbers to the appropriate integer numbers

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug_1480961_configure_economy into lp:widelands

2016-04-12 Thread GunChleoc
Not tested yet, but code LGTM. @Tibor: does this affect the AI in any way? -- https://code.launchpad.net/~widelands-dev/widelands/bug_1480961_configure_economy/+merge/291669 Your team Widelands Developers is requested to review the proposed merge of

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug_1480961_configure_economy into lp:widelands

2016-04-12 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug_1480961_configure_economy into lp:widelands. Commit message: Hide wares from configure economy which does not need prerequisites and therefor are produced 'endless' Requested reviews: Widelands Developers (widelands-dev) Related

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/test-ngettext into lp:widelands

2016-04-12 Thread Miroslav Remák
According to the gettext manual, "a simple gettext call with a form suitable for all values will do"[1] -- something like http://pastebin.com/raw/R2tGW9XH. The CLDR tables[2] clearly disprove this rule being universal, though. Flooring produces incorrect results for Slovak and I bet a lot of

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/test-ngettext into lp:widelands

2016-04-12 Thread GunChleoc
An example: "If the food supply is steady, this mine can produce iron ore in %s on average." %s is replaced by "%d second(s)", and %d can become floating point. The floor is what we have always had implicitly (and it also happens to be what my particular language does), so there is no change

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/test-ngettext into lp:widelands

2016-04-12 Thread Klaus Halfmann
Review: Approve compile, regressiontest.py +/- Having more tests is always good and the code looks OK for me. test-ngettext klaus$ ./regression_test.py -b ./widelands OTOH Miroslav question is valid, where or when do we need to show someting like "You have 3.145972 Item(plurals) in you

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/test-ngettext into lp:widelands

2016-04-12 Thread bunnybot
Continuous integration builds have changed state: Travis build 1000. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/122450845. Appveyor build 833. State: success. Details:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/test-ngettext into lp:widelands

2016-04-12 Thread Miroslav Remák
I'm not a fan of flooring the number in our C++ code. Passing a non-integer value to ngettext from Lua should result in an error (no idea what crashes you're talking about), IMO. Where do we need to pass floats? -- https://code.launchpad.net/~widelands-dev/widelands/test-ngettext/+merge/291587

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1545243-plnum-lua into lp:widelands

2016-04-12 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1545243-plnum-lua into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1545243-plnum-lua/+merge/291481 -- Your team Widelands Developers is

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1545243-plnum-lua into lp:widelands

2016-04-12 Thread GunChleoc
Excellent, thanks for the review and testing! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1545243-plnum-lua/+merge/291481 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1545243-plnum-lua.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1545243-plnum-lua into lp:widelands

2016-04-12 Thread Klaus Halfmann
Review: Approve review/compile/regression testst, playing OK, all fine now. I played a savegame for perhaps 15 Minutes, looked all fine -- https://code.launchpad.net/~widelands-dev/widelands/bug-1545243-plnum-lua/+merge/291481 Your team Widelands Developers is subscribed to branch

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/test-ngettext into lp:widelands

2016-04-12 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/test-ngettext into lp:widelands. Commit message: Created test for lua gettext functions. Requested reviews: Widelands Developers (widelands-dev) For more details, see:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1545243-plnum-lua into lp:widelands

2016-04-12 Thread GunChleoc
Review: Resubmit This should be all fixed now. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1545243-plnum-lua/+merge/291481 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1545243-plnum-lua. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1545243-plnum-lua into lp:widelands

2016-04-12 Thread GunChleoc
> * When setting some options I get: > > [] Section [global], key 'depth' not used (did you spell the name correctly?) > [] Section [global], key 'ui_font' not used (did you spell the name > correctly?) > [] Section [global], key 'speed_of_new_game' not used (did you spell the name > correctly?)