diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java index 0e792e7022..e551b15f03 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java @@ -84,8 +84,8 @@ public class NetDbRenderer { public void renderLeaseSetHTML(Writer out) throws IOException { StringBuilder buf = new StringBuilder(4*1024); buf.append("

" + _("Network Database Contents") + "

\n"); - buf.append("" + _("View") + " RouterInfo"); - buf.append("

LeaseSets

\n"); + buf.append("" + _("View RouterInfo") + ""); + buf.append("

").append(_("LeaseSets")).append("

\n"); Set leases = new TreeSet(new LeaseSetComparator()); leases.addAll(_context.netDb().getLeases()); long now = _context.clock().now(); @@ -132,7 +132,7 @@ public class NetDbRenderer { } public void renderStatusHTML(Writer out, boolean full) throws IOException { - out.write("

" + _("Network Database Contents") + " (" + _("View") + " LeaseSets)

\n"); + out.write("

" + _("Network Database Contents") + " (" + _("View LeaseSets") + ")

\n"); if (!_context.netDb().isInitialized()) { out.write(_("Not initialized")); out.flush(); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java index 69b08aa2f2..f7cb64a0a1 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java @@ -148,15 +148,15 @@ class ProfileOrganizerRenderer { buf.append("").append(num(prof.getIntegrationValue())); buf.append(""); if (_context.shitlist().isShitlisted(peer)) buf.append(_("Banned")); - if (prof.getIsFailing()) buf.append(" ").append(_("Failing")); - if (_context.commSystem().wasUnreachable(peer)) buf.append(" ").append(_("Unreachable")); + if (prof.getIsFailing()) buf.append(' ').append(_("Failing")); + if (_context.commSystem().wasUnreachable(peer)) buf.append(' ').append(_("Unreachable")); Rate failed = prof.getTunnelHistory().getFailedRate().getRate(30*60*1000); long fails = failed.getCurrentEventCount() + failed.getLastEventCount(); if (fails > 0) { Rate accepted = prof.getTunnelCreateResponseTime().getRate(30*60*1000); long total = fails + accepted.getCurrentEventCount() + accepted.getLastEventCount(); if (total / fails <= 10) // hide if < 10% - buf.append(' ').append(fails).append('/').append(total).append(" ").append(_("Test Fails")); + buf.append(' ').append(fails).append('/').append(total).append(' ').append(_("Test Fails")); } buf.append(" "); buf.append("").append(davg(dbh, 60*60*1000l)).append(""); buf.append("").append(davg(dbh, 24*60*60*1000l)).append(""); } else { - buf.append("n/an/an/an/an/an/a"); + for (int i = 0; i < 6; i++) + buf.append("").append(_(NA)); } } buf.append(""); buf.append("

").append(_("Thresholds:")).append("

"); - buf.append("

").append(_("Speed")).append(": ").append(num(_organizer.getSpeedThreshold())).append(" (").append(fast).append(" fast peers)
"); - buf.append("").append(_("Capacity")).append(": ").append(num(_organizer.getCapacityThreshold())).append(" (").append(reliable).append(" high capacity peers)
"); - buf.append("").append(_("Integration")).append(": ").append(num(_organizer.getIntegrationThreshold())).append(" (").append(integrated).append(" well integrated peers)

"); + buf.append("

").append(_("Speed")).append(": ").append(num(_organizer.getSpeedThreshold())) + .append(" (").append(fast).append(' ').append(_("fast peers")).append(")
"); + buf.append("").append(_("Capacity")).append(": ").append(num(_organizer.getCapacityThreshold())) + .append(" (").append(reliable).append(' ').append(_("high capacity peers")).append(")
"); + buf.append("").append(_("Integration")).append(": ").append(num(_organizer.getIntegrationThreshold())) + .append(" (").append(integrated).append(' ').append(_(" well integrated peers")).append(")

"); buf.append("

").append(_("Definitions")).append(":