Merge lp:~widelands-dev/widelands/stock-amounts into lp:widelands

[Benedikt Straub]

Very large amounts in WaresDisplays are shortened as "10k", "10M", "10G" to prevent text from flowing over on the left.

Numbers from 0 to 9999 are displayed normally, then abbreviated 10k up to 999k, then 1M to 999M, then 1G.
A whitespace between number and suffix ("10 k") would look nicer but sadly isn´t possible; testing, I found that "972 M" overflows again, while "972M" just fits. The current font and layout don´t permit more than 4 chars total here.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3928. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/426624392.
Appveyor build 3726. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_stock_amounts-3726.

[GunChleoc (gunchleoc)]

Just 1 nit for the i18n

[Benedikt Straub (nordfriese)]

OK, implemented your comment

[hessenfarmer (stephan-lutz)]

this will still fail on CI environments.
please merge newest trunk with the CI fixes in

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3935. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/427098399.
Appveyor build 3733. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_stock_amounts-3733.

[GunChleoc (gunchleoc)]

Code LGTM now, thanks!

Not tested yet.

review: Approve

[GunChleoc (gunchleoc)]

Now tested. I noticed that the economy options doesn't have it, but the change that somebody sets the target to 10k is kinda low :P

@bunnybot merge

=== modified file 'src/wui/waresdisplay.cc'
--- src/wui/waresdisplay.cc	2018-07-08 13:53:45 +0000
+++ src/wui/waresdisplay.cc	2018-09-11 07:44:57 +0000
@@ -22,7 +22,7 @@
 #include <cstdio>
 #include <utility>
 
-#include <boost/lexical_cast.hpp>
+#include <boost/format.hpp>
 
 #include "base/i18n.h"
 #include "base/wexception.h"
@@ -385,12 +385,33 @@
 	remove_all_warelists();
 }
 
+const char* unit_suffixes[] = {
+	"%1%",
+	/** TRANSLATORS: This is a large number with a suffix (e.g. 50k = 50,000). */
+	/** TRANSLATORS: Space is limited, use only 1 letter for the suffix and no whitespace. */
+	_("%1%k"),
+	/** TRANSLATORS: This is a large number with a suffix (e.g. 5M = 5,000,000). */
+	/** TRANSLATORS: Space is limited, use only 1 letter for the suffix and no whitespace. */
+	_("%1%M"),
+	/** TRANSLATORS: This is a large number with a suffix (e.g. 5G = 5,000,000,000). */
+	/** TRANSLATORS: Space is limited, use only 1 letter for the suffix and no whitespace. */
+	_("%1%G")
+};
+static std::string get_amount_string(uint32_t amount) {
+	uint8_t size = 0;
+	while (amount >= (size ? 1000 : 10000)) {
+		amount /= 1000;
+		size++;
+	}
+	return (boost::format(unit_suffixes[size]) % amount).str();
+}
+
 std::string WaresDisplay::info_for_ware(Widelands::DescriptionIndex ware) {
 	int totalstock = 0;
 	for (const Widelands::WareList* warelist : warelists_) {
 		totalstock += warelist->stock(ware);
 	}
-	return boost::lexical_cast<std::string>(totalstock);
+	return get_amount_string(totalstock);
 }
 
 /*
@@ -420,7 +441,7 @@
 				       "<div width=26 background=454545><p align=center><img src=\"" +
 				       tribe.get_ware_descr(c->first)->icon_filename() +
 				       "\"></p></div><div width=26 background=000000><p><font size=9>" +
-				       boost::lexical_cast<std::string>(static_cast<int32_t>(c->second)) +
+				       get_amount_string(c->second) +
 				       "</font></p></div></p></div>";
 			}
 	return ret;