widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~gunchleoc/widelands/bug-1278583 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1278583 in widelands: "build completion status not translated"
  https://bugs.launchpad.net/widelands/+bug/1278583

For more details, see:
https://code.launchpad.net/~gunchleoc/widelands/bug-1278583/+merge/210091

Another small bugfix
-- 
https://code.launchpad.net/~gunchleoc/widelands/bug-1278583/+merge/210091
Your team Widelands Developers is requested to review the proposed merge of lp:~gunchleoc/widelands/bug-1278583 into lp:widelands.

=== modified file 'src/logic/constructionsite.cc'
--- src/logic/constructionsite.cc	2014-03-03 20:50:30 +0000
+++ src/logic/constructionsite.cc	2014-03-09 18:35:23 +0000
@@ -89,7 +89,7 @@
 	unsigned int percent = (get_built_per64k() * 100) >> 16;
 	std::string perc_s =
 		(boost::format("<font color=%s>%s</font>")
-		 % UI_FONT_CLR_DARK_HEX % (boost::format(_("%1$i%% built")) % percent).str())
+		 % UI_FONT_CLR_DARK_HEX % (boost::format(_("%i%% built")) % percent).str())
 		 .str();
 	return perc_s;
 }

=== modified file 'src/logic/immovable.cc'
--- src/logic/immovable.cc	2014-03-04 13:24:58 +0000
+++ src/logic/immovable.cc	2014-03-09 18:35:23 +0000
@@ -540,7 +540,9 @@
 	if (game.get_ibase()->get_display_flags() & Interactive_Base::dfShowStatistics) {
 		unsigned int percent = (100 * done / total);
 		m_construct_string =
-			(boost::format("<font color=%1$s>%2$i%% built</font>") % UI_FONT_CLR_DARK_HEX % percent).str();
+			(boost::format("<font color=%s>%s</font>")
+			 % UI_FONT_CLR_DARK_HEX % (boost::format(_("%i%% built")) % percent).str())
+			 .str();
 		m_construct_string = as_uifont(m_construct_string);
 		dst.blit(pos - Point(0, 48), UI::g_fh1->render(m_construct_string), CM_Normal, UI::Align_Center);
 	}