widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #06558
Re: [Merge] lp:~widelands-dev/widelands/dismantlesite-color into lp:widelands
Replied :)
Diff comments:
> === modified file 'src/logic/map_objects/tribes/dismantlesite.cc'
> --- src/logic/map_objects/tribes/dismantlesite.cc 2016-02-18 18:27:52 +0000
> +++ src/logic/map_objects/tribes/dismantlesite.cc 2016-03-13 09:28:07 +0000
> @@ -93,7 +94,8 @@
> void DismantleSite::update_statistics_string(std::string* s)
> {
> unsigned int percent = (get_built_per64k() * 100) >> 16;
> - *s = (boost::format(_("%u%% dismantled")) % percent).str();
> + *s = (boost::format("<font color=%s>%s</font>") % UI_FONT_CLR_DARK.hex_value() %
> + (boost::format(_("%u%% dismantled")) % percent).str()).str();
_() is a macro for the gettext translation function, so it needs to be called separately. With my function, we see a translation of:
"x% dismantled"
on screen. With your function, we see an untranslated
"_(x% dismantled)"
I will look into the str(), maybe we can lose one of those :)
> }
>
> /*
--
https://code.launchpad.net/~widelands-dev/widelands/dismantlesite-color/+merge/288866
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/dismantlesite-color into lp:widelands.
References