diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java index 8ba4708405..26d026a169 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java @@ -142,7 +142,7 @@ public class PluginUpdateHandler extends UpdateHandler { buf.append(_pct.format(pct)); } buf.append(": "); - buf.append(_("{0}B transferred", DataHelper.formatSize(currentWrite + alreadyTransferred))); + buf.append(_("{0}B transferred", DataHelper.formatSize2(currentWrite + alreadyTransferred))); updateStatus(buf.toString()); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java index da5305ef0d..9206340cab 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java @@ -105,7 +105,7 @@ public class TunnelRenderer { out.write("" + DataHelper.formatDuration(timeLeft) + ""); else out.write("(" + _("grace period") + ")"); - out.write("" + cfg.getProcessedMessagesCount() + "KB"); + out.write("" + cfg.getProcessedMessagesCount() + " KB"); int lifetime = (int) ((_context.clock().now() - cfg.getCreation()) / 1000); if (lifetime <= 0) lifetime = 1; @@ -124,7 +124,7 @@ public class TunnelRenderer { } out.write("\n"); out.write("
" + _("Inactive participating tunnels") + ": " + inactive + "
\n"); - out.write("
" + _("Lifetime bandwidth usage") + ": " + DataHelper.formatSize(processed*1024) + "B
\n"); + out.write("
" + _("Lifetime bandwidth usage") + ": " + DataHelper.formatSize2(processed*1024) + "B
\n"); renderPeers(out); } @@ -176,7 +176,7 @@ public class TunnelRenderer { else out.write(" \"Outbound\""); out.write(" " + DataHelper.formatDuration(timeLeft) + "\n"); - out.write(" " + info.getProcessedMessagesCount() + "KB\n"); + out.write(" " + info.getProcessedMessagesCount() + " KB\n"); for (int j = 0; j < info.getLength(); j++) { Hash peer = info.getPeer(j); TunnelId id = (info.isInbound() ? info.getReceiveTunnelId(j) : info.getSendTunnelId(j)); @@ -215,8 +215,9 @@ public class TunnelRenderer { } if (live <= 0) out.write("
" + _("No tunnels; waiting for the grace period to end.") + "
\n"); - out.write("
" + _("Lifetime bandwidth usage") + ": " + DataHelper.formatSize(processedIn*1024) + "B " + _("in") + ", " + - DataHelper.formatSize(processedOut*1024) + "B " + _("out") + "
"); + out.write("
" + _("Lifetime bandwidth usage") + ": " + + DataHelper.formatSize2(processedIn*1024) + "B " + _("in") + ", " + + DataHelper.formatSize2(processedOut*1024) + "B " + _("out") + "
"); } private void renderPeers(Writer out) throws IOException { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java index f411538a32..9506400cf2 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java @@ -176,7 +176,7 @@ public class UpdateHandler { buf.append(_pct.format(pct)); } buf.append(":
\n"); - buf.append(_("{0}B transferred", DataHelper.formatSize(currentWrite + alreadyTransferred))); + buf.append(_("{0}B transferred", DataHelper.formatSize2(currentWrite + alreadyTransferred))); updateStatus(buf.toString()); } public void transferComplete(long alreadyTransferred, long bytesTransferred, long bytesRemaining, String url, String outputFile, boolean notModified) {