widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1351620 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1351620 in widelands: "boost::too_many_args: during battle"
  https://bugs.launchpad.net/widelands/+bug/1351620

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1351620/+merge/229361

Oops, I had missed some text cases there..... bug in militarysite statistics string fixed.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1351620/+merge/229361
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1351620 into lp:widelands.

=== modified file 'src/logic/militarysite.cc'
--- src/logic/militarysite.cc	2014-08-02 10:14:12 +0000
+++ src/logic/militarysite.cc	2014-08-03 14:12:06 +0000
@@ -137,12 +137,12 @@
 			/** TRANSLATORS: %3% is the maximum number of soldier slots in the building */
 			*s =
 					(boost::format(ngettext("%1%(+%2%) soldier (+%3%)", "%1%(+%2%) soldiers (+%3%)", stationed))
-					 % stationed % present % (stationed - present) % (m_capacity - stationed)).str();
+					 % present % (stationed - present) % (m_capacity - stationed)).str();
 		} else {
 			/** TRANSLATORS: %1% is the number of soldiers the plural refers to */
 			/** TRANSLATORS: %2% are currently open soldier slots in the building */
 			*s += (boost::format(ngettext("%1%(+%2%) soldier", "%1%(+%2%) soldiers", stationed))
-					% stationed % present).str();
+					% present % (stationed - present)).str();
 		}
 	}
 }