Merge lp:~gunchleoc/widelands/bug-1278583 into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 6859
Proposed branch: lp:~gunchleoc/widelands/bug-1278583
Merge into: lp:widelands
Diff against target: 27 lines (+4/-2)
2 files modified
src/logic/constructionsite.cc (+1/-1)
src/logic/immovable.cc (+3/-1)
To merge this branch: bzr merge lp:~gunchleoc/widelands/bug-1278583
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+210091@code.launchpad.net

Description of the change

Another small bugfix

To post a comment you must log in.
Revision history for this message
SirVer (sirver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/logic/constructionsite.cc'
2--- src/logic/constructionsite.cc 2014-03-03 20:50:30 +0000
3+++ src/logic/constructionsite.cc 2014-03-09 18:35:23 +0000
4@@ -89,7 +89,7 @@
5 unsigned int percent = (get_built_per64k() * 100) >> 16;
6 std::string perc_s =
7 (boost::format("<font color=%s>%s</font>")
8- % UI_FONT_CLR_DARK_HEX % (boost::format(_("%1$i%% built")) % percent).str())
9+ % UI_FONT_CLR_DARK_HEX % (boost::format(_("%i%% built")) % percent).str())
10 .str();
11 return perc_s;
12 }
13
14=== modified file 'src/logic/immovable.cc'
15--- src/logic/immovable.cc 2014-03-04 13:24:58 +0000
16+++ src/logic/immovable.cc 2014-03-09 18:35:23 +0000
17@@ -540,7 +540,9 @@
18 if (game.get_ibase()->get_display_flags() & Interactive_Base::dfShowStatistics) {
19 unsigned int percent = (100 * done / total);
20 m_construct_string =
21- (boost::format("<font color=%1$s>%2$i%% built</font>") % UI_FONT_CLR_DARK_HEX % percent).str();
22+ (boost::format("<font color=%s>%s</font>")
23+ % UI_FONT_CLR_DARK_HEX % (boost::format(_("%i%% built")) % percent).str())
24+ .str();
25 m_construct_string = as_uifont(m_construct_string);
26 dst.blit(pos - Point(0, 48), UI::g_fh1->render(m_construct_string), CM_Normal, UI::Align_Center);
27 }

Subscribers

People subscribed via source and target branches

to status/vote changes: