From c5ea51beec3f3ee55abb2ef79f684ec3aa7f8270 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 2 Jun 2010 18:16:43 +0000
Subject: [PATCH] * graphs.jsp: Tag some more
---
.../java/src/net/i2p/router/web/GraphHelper.java | 6 ++++--
.../java/src/net/i2p/router/web/HelperBase.java | 5 +++++
.../java/src/net/i2p/router/web/Messages.java | 5 +++++
.../java/src/net/i2p/router/web/StatSummarizer.java | 1 +
.../java/src/net/i2p/router/web/SummaryRenderer.java | 7 ++++++-
apps/routerconsole/java/strings/Strings.java | 7 +++++++
6 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
index 2d676bdacf..94dc08b98a 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
@@ -79,19 +79,21 @@ public class GraphHelper extends HelperBase {
+ "&width=" + (3 * _width)
+ "&height=" + (3 * _height)
+ "\" / target=\"_blank\">");
+ String title = _("Combined bandwidth graph");
_out.write("<img class=\"statimage\" width=\""
+ (_width + 83) + "\" height=\"" + (_height + 92)
+ "\" src=\"viewstat.jsp?stat=bw.combined"
+ "&periodCount=" + _periodCount
+ "&width=" + _width
+ "&height=" + (_height - 14)
- + "\" alt=\"Combined bandwidth graph\" title=\"Combined bandwidth graph\"></a>\n");
+ + "\" alt=\"" + title + "\" title=\"" + title + "\"></a>\n");
}
for (Iterator iter = ordered.iterator(); iter.hasNext(); ) {
SummaryListener lsnr = (SummaryListener)iter.next();
Rate r = lsnr.getRate();
- String title = r.getRateStat().getName() + " for " + DataHelper.formatDuration(_periodCount * r.getPeriod());
+ // e.g. "statname for 60m"
+ String title = _("{0} for {1}", r.getRateStat().getName(), DataHelper.formatDuration(_periodCount * r.getPeriod()));
_out.write("<a href=\"viewstat.jsp?stat="
+ r.getRateStat().getName()
+ "&showEvents=" + _showEvents
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java b/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java
index 1d1d03d592..802e059adf 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java
@@ -51,6 +51,11 @@ public abstract class HelperBase {
return Messages.getString(s, o, _context);
}
+ /** two params @since 0.7.14 */
+ public String _(String s, Object o, Object o2) {
+ return Messages.getString(s, o, o2, _context);
+ }
+
/** translate (ngettext) @since 0.7.14 */
public String _(int n, String s, String p) {
return Messages.getString(n, s, p, _context);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/Messages.java b/apps/routerconsole/java/src/net/i2p/router/web/Messages.java
index 427ac9d8ae..b50940fab5 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/Messages.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/Messages.java
@@ -30,6 +30,11 @@ public class Messages extends Translate {
return Translate.getString(s, o, ctx, BUNDLE_NAME);
}
+ /** two params @since 0.7.14 */
+ public static String getString(String s, Object o, Object o2, I2PAppContext ctx) {
+ return Translate.getString(s, o, o2, ctx, BUNDLE_NAME);
+ }
+
/** translate (ngettext) @since 0.7.14 */
public static String getString(int n, String s, String p, I2PAppContext ctx) {
return Translate.getString(n, s, p, ctx, BUNDLE_NAME);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java b/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java
index 0bcaaf315a..72c93330e2 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java
@@ -170,6 +170,7 @@ public class StatSummarizer implements Runnable {
def.setTimePeriod(start/1000, 0);
def.setLowerLimit(0d);
def.setBaseValue(1024);
+ // Note to translators: all runtime zh translation disabled in this file, no font available in RRD
String title = _("Bandwidth usage");
if (!hideTitle)
def.setTitle(title);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
index 7ee62510ba..f26426edca 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
@@ -80,6 +80,7 @@ class SummaryRenderer {
String title;
String p = DataHelper.formatDuration(_listener.getRate().getPeriod());
if (showEvents)
+ // Note to translators: all runtime zh translation disabled in this file, no font available in RRD
title = name + ' ' + _("events in {0}", p);
else
title = name + ' ' + _("averaged for {0}", p);
@@ -96,7 +97,11 @@ class SummaryRenderer {
} else {
// include the average value
plotName = dsNames[0];
- descr = _listener.getRate().getRateStat().getDescription();
+ // The descriptions are not tagged in the createRateStat calls
+ // (there are over 500 of them)
+ // but the descriptions for the default graphs are tagged in
+ // Strings.java
+ descr = _(_listener.getRate().getRateStat().getDescription());
}
def.datasource(plotName, path, plotName, "AVERAGE", "MEMORY");
def.area(plotName, Color.BLUE, descr + "@r");
diff --git a/apps/routerconsole/java/strings/Strings.java b/apps/routerconsole/java/strings/Strings.java
index 8d37b3b763..b71541c78b 100644
--- a/apps/routerconsole/java/strings/Strings.java
+++ b/apps/routerconsole/java/strings/Strings.java
@@ -96,5 +96,12 @@ class Dummy {
_("itag1");
_("itag2");
+ // Descriptions for the stats that are graphed by default
+ // There are over 500 stats currently defined, we aren't going to tag them all
+ _("Low-level bandwidth receive rate"); // bw.recvRate
+ _("Low-level bandwidth send rate"); // bw.sendRate
+ _("How many peers we are actively talking with"); // router.activePeers
+ // router.memoryUsed currently has the max size in the description so it can't be tagged
+
}
}
--
GitLab