(svn r21009) -Fix: for the compact notation 1.000.000k and 1.000M would be shown depending on the initial (and later rounded) value. Make everything that would round to 1.000.000k be drawn as 1.000M as well.

14 years ago · 9f256e8785
parent 3a1a915c9a
commit 9f256e8785
1 changed files with 3 additions and 1 deletions
--- a/src/strings.cpp
+++ b/src/strings.cpp
@ -339,7 +339,9 @@ static char *FormatGenericCurrency(char *buff, const CurrencySpec *spec, Money n

 	/* for huge numbers, compact the number into k or M */
 	if (compact) {
-		if (number >= 1000000000) {
+		/* Take care of the 'k' rounding. Having 1 000 000 k
+		 * and 1 000 M is inconsistent, so always use 1 000 M. */
+		if (number >= 1000000000 - 500) {
 			number = (number + 500000) / 1000000;
 			multiplier = "M";
 		} else if (number >= 1000000) {