Author: toad
Date: 2007-06-30 13:17:40 +0000 (Sat, 30 Jun 2007)
New Revision: 13846
Modified:
trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/OpennetConnectionsToadlet.java
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
Log:
Fix title of opennet page
Modified: trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2007-06-30 13:16:29 UTC (rev 13845)
+++ trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2007-06-30 13:17:40 UTC (rev 13846)
@@ -165,7 +165,7 @@
titleCountString = (numberOfNotConnected +
numberOfSimpleConnected)>0 ? String.valueOf(numberOfSimpleConnected) : "";
}
- HTMLNode pageNode =
ctx.getPageMaker().getPageNode(L10n.getString("DarknetConnectionsToadlet.fullTitle",
new String[] { "counts", "name" }, new String[] { titleCountString,
node.getMyName() } ), ctx);
+ HTMLNode pageNode =
ctx.getPageMaker().getPageNode(getPageTitle(titleCountString,
node.getMyName()), ctx);
HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
// FIXME! We need some nice images
@@ -487,6 +487,8 @@
}
+ protected abstract String getPageTitle(String titleCountString, String
myName);
+
protected Comparator comparator(String sortBy, boolean reversed) {
return new ComparatorByStatus(sortBy, reversed);
}
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2007-06-30 13:16:29 UTC (rev 13845)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2007-06-30 13:17:40 UTC (rev 13846)
@@ -444,5 +444,8 @@
return node.peers.getDarknetPeerNodeStatuses();
}
+ protected String getPageTitle(String titleCountString, String myName) {
+ return L10n.getString("DarknetConnectionsToadlet.fullTitle",
new String[] { "counts", "name" }, new String[] { titleCountString,
node.getMyName() } );
+ }
}
Modified: trunk/freenet/src/freenet/clients/http/OpennetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/OpennetConnectionsToadlet.java
2007-06-30 13:16:29 UTC (rev 13845)
+++ trunk/freenet/src/freenet/clients/http/OpennetConnectionsToadlet.java
2007-06-30 13:17:40 UTC (rev 13846)
@@ -1,6 +1,7 @@
package freenet.clients.http;
import freenet.client.HighLevelSimpleClient;
+import freenet.l10n.L10n;
import freenet.node.Node;
import freenet.node.NodeClientCore;
import freenet.node.PeerNodeStatus;
@@ -43,4 +44,8 @@
return node.isOpennetEnabled();
}
+ protected String getPageTitle(String titleCountString, String myName) {
+ return L10n.getString("OpennetConnectionsToadlet.fullTitle",
new String[] { "counts", "name" }, new String[] { titleCountString,
node.getMyName() } );
+ }
+
}
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-06-30
13:16:29 UTC (rev 13845)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-06-30
13:17:40 UTC (rev 13846)
@@ -593,6 +593,7 @@
NodeUpdateManager.updateFailedTitle=Update Failed!
NodeUpdateManager.updateURI=Where should the node look for updates?
NodeUpdateManager.updateURILong=Where should the node look for updates?
+OpennetConnectionsToadlet.fullTitle=${counts} Opennet Peers of ${name}
PNGFilter.invalidHeader=The file you tried to fetch is not a PNG. It does not
include a valid PNG header. It might be some other file format, and your
browser may do something dangerous with it, therefore we have blocked it.
PNGFilter.invalidHeaderTitle=Not a PNG - invalid header
PeerManagerUserAlert.clockProblemTitle=Clock problem
