Fixed translation markup in unit::describe_builtin_effect()

[gunchleoc]

Replaced hard-coded word order and N_ for all strings in
unit::describe_builtin_effect() with vgettext/vngettext using
placeholders.

[gunchleoc]

The diff is hard to read here, I found that git-cola did a better job on that.

[Vultraz]

Split diff view is easier.

[gfgtdf]

hmm it seems like the code previousl used print_modifier which inserts a + before positive numbers to makew it clearer that that amounts gets added to the previous value

[gunchleoc]

Not only previously - print_modifier is still used after my changes.

[CelticMinstrel]

Hmm. Not really happy with the increased indentation level, though I can see why it was done... the stoi looks fishy but on closer inspection is actually fine... hmm...

Well, I guess I have no real objections to this. I could see a way to decrease the indentation a little, but dunno if it's worth it. (It's else if(!effect["increase"].empty()).)

[gfgtdf]

ok didn't see it at first

[gunchleoc]

I added the extra indentation level to get rid of lots of code duplication. The extra level is caused by hitpoints having a different effect than the rest. We could get rid of the extra indentation though if I did this:

const std::string &increase = (apply_to == "hitpoints") ? effect["increase_total"] : effect["increase"];

I'll be happy to change it if you prefer that.

[Vultraz]

Or you can also do if(increase.empty()) { return ""; }.

[CelticMinstrel]

I don't see how Gunchleoc's suggestion would reduce the indentation level, given that attack also has a different effect... unless you're proposing calculating it redundantly even if the method is attack, in which case it would reduce the indentation level.

Vultraz's suggestion would definitely work.

[gunchleoc]

I implemented the early return now, which gains us 1 indentation level for the bottom part.

Attack has completely separate handling, so that indentation level has to stay like it was before.

I also added a comment to the diff.

[gunchleoc]

We can gain an indentation level here if we lose the "else" - IMO that would make the code structure a bit weird though.

[CelticMinstrel]

Well, I don't have any objections to merging this.

[gunchleoc]

Thanks for the review :)