From 20b7104c41bc852849e125290d6b70e58967bf2d Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Fri, 13 Dec 2019 11:37:20 +0000 Subject: [PATCH] wrong formatting for ETA and progress --- webui/src/main/java/com/muwire/webui/DownloadServlet.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webui/src/main/java/com/muwire/webui/DownloadServlet.java b/webui/src/main/java/com/muwire/webui/DownloadServlet.java index c4d57b0e..5db030ba 100644 --- a/webui/src/main/java/com/muwire/webui/DownloadServlet.java +++ b/webui/src/main/java/com/muwire/webui/DownloadServlet.java @@ -166,9 +166,9 @@ public class DownloadServlet extends HttpServlet { if (ETA == Long.MAX_VALUE) ETAString = Util._t("Unknown"); else - ETAString = DataHelper.formatDate(ETA); + ETAString = DataHelper.formatDuration(ETA); sb.append("").append(ETAString).append(""); - String progress = String.format("%2d", percent) + "% of "+totalSize; + String progress = String.format("%2d", percent) + "% of "+DataHelper.formatSize2Decimal(totalSize, false) + "B"; sb.append("").append(progress).append(""); sb.append(""); }