[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
hessenfarmer has proposed merging
lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands.
Commit message:
fixes bug 1792297
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1792297 in widelands: "Advanced buildings report wrong worker experience
in the encyclopedia"
https://bugs.launchpad.net/widelands/+bug/1792297
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986
correct experience levels are displayed for the workers in the building help.
all possible working places for workers are listed including positions of lower
experienced workers
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands.
=== modified file 'data/tribes/scripting/help/building_help.lua'
--- data/tribes/scripting/help/building_help.lua 2018-09-12 19:51:07 +
+++ data/tribes/scripting/help/building_help.lua 2018-09-15 16:11:36 +
@@ -666,6 +666,9 @@
end
end
+ worker_description = building_description.working_positions[1]
+ becomes_description = worker_description.becomes
+
if (becomes_description) then
result = result .. help_worker_experience(worker_description, becomes_description)
end
=== modified file 'data/tribes/scripting/help/worker_help.lua'
--- data/tribes/scripting/help/worker_help.lua 2017-12-07 08:17:40 +
+++ data/tribes/scripting/help/worker_help.lua 2018-09-15 16:11:36 +
@@ -97,15 +97,37 @@
--
function worker_help_employers_string(worker_description)
local result = ""
- local employers = worker_description.employers;
- if (#employers > 0) then
+ if (#worker_description.employers > 0) then
-- TRANSLATORS: Worker Encyclopedia: A list of buildings where a worker can work
-- TRANSLATORS: You can also translate this as 'workplace(s)'
- result = result .. h2(ngettext("Works at", "Works at", #employers))
+ result = result .. h2(ngettext("Works at", "Works at", #worker_description.employers))
for i, building in ipairs(worker_description.employers) do
result = result .. dependencies({worker_description, building}, building.descname)
end
+ building = worker_description.employers[1]
+ if #building.working_positions > 1 and worker_description.descname == building.working_positions[2].descname and worker_description.descname ~= building.working_positions[1].descname then
+for i, build in ipairs(building.working_positions[1].employers) do
+ if not build.working_positions[2] then
+ -- TRANSLATORS: this text should describe that a more expereinced worker can be a substitute for a less experienced worker
+ result = result .. dependencies({worker_description, build}, build.descname .. _" (instead of " .. build.working_positions[1].descname .. ")")
+ end
+end
+ elseif #building.working_positions > 2 and worker_description.descname == building.working_positions[3].descname then
+for i, build in ipairs(building.working_positions[1].employers) do
+ if #build.working_positions > 1 and not build.working_positions[3] then
+ -- TRANSLATORS: This text should describe that a level 3 worker can be a substitute for a level 2 worker or a level 1 worker
+ result = result .. dependencies({worker_description, build}, build.descname .. _" (instead of " .. build.working_positions[2].descname .. " or " .. build.working_positions[1].descname .. ")")
+ end
+end
+for i, build in ipairs(building.working_positions[1].employers) do
+ if not build.working_positions[2] then
+ -- TRANSLATORS: this text should describe that a more expereinced worker can be a substitute for a less experienced worker
+ result = result .. dependencies({worker_description, build}, build.descname .. _" (instead of " .. build.working_positions[1].descname .. ")")
+ end
+end
+ end
+ -- end
end
return result
end
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
Continuous integration builds have changed state: Travis build 3986. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/429076020. Appveyor build 3784. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug1792297_worker_encyclopedia-3784. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
Continuous integration builds have changed state: Travis build 3993. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/429723572. Appveyor build 3790. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug1792297_worker_encyclopedia-3790. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
Continuous integration builds have changed state: Travis build 4036. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/432827924. Appveyor build 3832. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug1792297_worker_encyclopedia-3832. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
Some small nits. Not tested.
Diff comments:
>
> === modified file 'data/tribes/scripting/help/worker_help.lua'
> --- data/tribes/scripting/help/worker_help.lua2017-12-07 08:17:40
> +
> +++ data/tribes/scripting/help/worker_help.lua2018-09-15 19:34:05
> +
> @@ -97,15 +97,37 @@
> --
> function worker_help_employers_string(worker_description)
> local result = ""
> - local employers = worker_description.employers;
>
> - if (#employers > 0) then
> + if (#worker_description.employers > 0) then
>-- TRANSLATORS: Worker Encyclopedia: A list of buildings where a
> worker can work
>-- TRANSLATORS: You can also translate this as 'workplace(s)'
> - result = result .. h2(ngettext("Works at", "Works at", #employers))
> + result = result .. h2(ngettext("Works at", "Works at",
> #worker_description.employers))
>for i, building in ipairs(worker_description.employers) do
> result = result .. dependencies({worker_description, building},
> building.descname)
>end
> + building = worker_description.employers[1]
> + if #building.working_positions > 1 and worker_description.descname
> == building.working_positions[2].descname and worker_description.descname ~=
> building.working_positions[1].descname then
Compare name rather than descname - names are guaranteed to be unique,
descnames are translatable and not under our control regarding uniqueness.
> +for i, build in ipairs(building.working_positions[1].employers)
> do
> + if not build.working_positions[2] then
> + -- TRANSLATORS: this text should describe that a more
> expereinced worker can be a substitute for a less experienced worker
> + result = result .. dependencies({worker_description,
> build}, build.descname .. _" (instead of " ..
> build.working_positions[1].descname .. ")")
> + end
> +end
> + elseif #building.working_positions > 2 and
> worker_description.descname == building.working_positions[3].descname then
> +for i, build in ipairs(building.working_positions[1].employers)
> do
> + if #build.working_positions > 1 and not
> build.working_positions[3] then
> + -- TRANSLATORS: This text should describe that a level 3
> worker can be a substitute for a level 2 worker or a level 1 worker
> + result = result .. dependencies({worker_description,
> build}, build.descname .. _" (instead of " ..
> build.working_positions[2].descname .. " or " ..
> build.working_positions[1].descname .. ")")
> + end
> +end
> +for i, build in ipairs(building.working_positions[1].employers)
> do
> + if not build.working_positions[2] then
> + -- TRANSLATORS: this text should describe that a more
> expereinced worker can be a substitute for a less experienced worker
typo: experienced
> + result = result .. dependencies({worker_description,
> build}, build.descname .. _" (instead of " ..
> build.working_positions[1].descname .. ")")
> + end
> +end
> + end
> + -- end
> end
> return result
> end
--
https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
I just did some testing - I'd replace the "instead of" variations with the usual experience on the bottom. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
fixed the first comments. I don't understand what you mean with your last comment. I just wanted to make clear that they are not required by these buildings but rather substitute a lower level worker. Perhaps we can have a (required) behind the normal working places and an optional behind the substitute places. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
Yes, a (required) is a good idea. Further details are then available at the building help. What I meant was that the building help has a section where the needed experience for upgrades is shown. The worker help could have the same section - or maybe it already does and I overlooked it? -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
Oh, and another thing: use bformat to assemble your strings - hard-coding word order will cause problems for translators -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
the experience section is present for each of the lower level workers. Not for the most educated worker which makes sense in the worker help (imho). the "instead of" string was meant to determine that the experienced worker can be a replacement for the mentioned less experienced worker in the specified building. id we are going to use (required) and (optional) some information will be lost. Just for my understanding what is your rational against the instead of string? Will try to fix the format of the strings tonight though -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
Perhaps I should have explained that this branch contains 2 separate fixes to 2 separate problems mentioned in the forum. the first is the fix of the linked bug. This is done in buildhelp, which now shows the correct experience levels of all upgrades in each building where experience does matter. The second fix was intended to show each possible working place for each worker not only the ones where he is required. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
I actually think that we should not add any strings at this point if we can avoid it, because we're in feature freeze. The information is also available at each building's help, so I don't think that the "instead of" addition is urgent enough to have it now. We can think of a good phrasing later. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
Ok I'll just add the possible working places without any further comment then. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
Thanks! If you'd still like to offer more explanation at that point in the encyclopedia, please open a new bug and target it to Build 21. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
Just added a new version. Could not resist to insert a heading for the additional working places delivering the information. If you don't want to have it now, please just comment the 2 relevant lines out so we could probably reactivate them for b21 -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
I have pushed a string fix. I think the code for the collection of buildings needs fixing though. It will break as soon as somebody creates a tribe with more than 3 worker levels. I recommend the following: 1. Collect the buildings the worker works at directly in a table 2. Create a second table for the other buildings the worker may work at and only add buildings there that aren't listed in either table yet 3. Add the info to the result variable This way, you'll also get rid of some code duplication. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
The string that is exchanged is longer than one line in the column of the Encyclopedia now and therefore is not looking very good. The Ngettext construct was copied from the heading of the list of buildings where the worker needs to work at, as I was not sure whether in any language it makes a difference if there is one building or more buildings where he can work. I can have a look into this issue tonight then. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
What about changing the headings as follows: 1. change first heading from "Works at" to "Needs to work at" 2. change second heading to "Can also work at" this would fit into one line of heading and contains most of the information (the info that this replaces less experienced is lost but doesn't matter that much) -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
I am in favor of 2. - we can leave 1. as it is, no need to change that. I removed the plural because it's not really needed - I think we could skip it in the other header too, but that would break current translations. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
I am not sure whether the translation of "at" is really the same in all languages independent if one or more buildings are in the list. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
I don't think it's a problem if it gets translated as "Other workplaces" or something similar with only 1 building in the list, because it's a heading. If the text was "Can work at x other buildings", that we'd definitely need plural forms. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
Currently the translations for German and French contain the singular and plural form of workplace for "Works at" as it is envisaged in the translators hint. However Spanish translation has erroneously set the verb "works" into singular and plural form. I will leave a note there -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
ok I implemented the solution which uses a table and is therefore independent of the training levels. I reintroduced the pluralisation due to some languages have currently used the alternativ translation "workplace(s)" which is dependent of number. for these languages it would be nice to have the same construct for the additional workplace(s) as well. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
Review: Approve I have added a special case for the number 1, since ngettext for 1 also matches 11 in my language, which is inappropriate for a heading. We should fix this in the future for all headings. I have commented out the strings to be activated after Build 20. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
although I don't understand the problem fully we should have a bug filed for b21 to fix the ngettext issue. In this special case I don't see this corner case arriving as currently there is no list that has more than 10 entries I think (this is for the barbarians miner). And another one to revert the commenting. I believe we have to rethink the code properly then. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
2 bug s filed for that -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
Thanks for filing the bugs :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
