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("\n");
+ out.write("\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/a | n/a | n/a | n/a | n/a | n/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(":");
buf.append("- ").append(_("groups")).append(": ").append(_("as determined by the profile organizer")).append("
");
buf.append("- ").append(_("caps")).append(": ").append(_("capabilities in the netDb, not used to determine profiles")).append("
");
@@ -301,29 +305,29 @@ class ProfileOrganizerRenderer {
private final static DecimalFormat _fmt = new DecimalFormat("###,##0.00");
private final static String num(double num) { synchronized (_fmt) { return _fmt.format(num); } }
- private final static String na = "n/a";
+ private final static String NA = HelperBase._x("n/a");
- private static String avg (PeerProfile prof, long rate) {
+ private String avg (PeerProfile prof, long rate) {
RateStat rs = prof.getDbResponseTime();
if (rs == null)
- return na;
+ return _(NA);
Rate r = rs.getRate(rate);
if (r == null)
- return na;
+ return _(NA);
long c = r.getCurrentEventCount() + r.getLastEventCount();
if (c == 0)
- return na;
+ return _(NA);
double d = r.getCurrentTotalValue() + r.getLastTotalValue();
return Math.round(d/c) + "ms";
}
- private static String davg (DBHistory dbh, long rate) {
+ private String davg (DBHistory dbh, long rate) {
RateStat rs = dbh.getFailedLookupRate();
if (rs == null)
- return na;
+ return _(NA);
Rate r = rs.getRate(rate);
if (r == null)
- return na;
+ return _(NA);
long c = r.getCurrentEventCount() + r.getLastEventCount();
return "" + c;
}
|