Author: toad
Date: 2007-12-11 00:01:46 +0000 (Tue, 11 Dec 2007)
New Revision: 16469
Modified:
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
trunk/freenet/src/freenet/node/Announcer.java
Log:
Mention the cooling off period if in it.
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-12-10
23:56:28 UTC (rev 16468)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-12-11
00:01:46 UTC (rev 16469)
@@ -4,6 +4,7 @@
Announcer.announceDetails=We have recently sent ${recentSentAnnouncements}
announcements, ${runningAnnouncements} of which are still running, and added
${addedNodes} nodes (${refusedNodes} nodes have rejected us). We are currently
connected to ${connectedSeednodes} seednodes and trying to connect to another
${disconnectedSeednodes}.
Announcer.announceAlertNoSeednodes=There is no seednodes.fref file found, so
the node will not be able to automatically bootstrap itself onto the opennet.
Please add some nodes manually.
Announcer.announceLoading=The node is currently loading the seednodes file so
that it can attempt to announce to the rest of the network. Announcement may
take a few minutes.
+Announcer.coolingOff=For the next ${time} seconds, the node is waiting for the
nodes that it just announced to to connect, if there are not enough nodes it
will try a different node.
BookmarkEditorToadlet.addBookmark=Add Bookmark
BookmarkEditorToadlet.addCategory=Add Category
BookmarkEditorToadlet.addNewBookmark=Add a new bookmark
Modified: trunk/freenet/src/freenet/node/Announcer.java
===================================================================
--- trunk/freenet/src/freenet/node/Announcer.java 2007-12-10 23:56:28 UTC
(rev 16468)
+++ trunk/freenet/src/freenet/node/Announcer.java 2007-12-11 00:01:46 UTC
(rev 16469)
@@ -412,11 +412,13 @@
int runningAnnouncements;
int connectedSeednodes = 0;
int disconnectedSeednodes = 0;
+ long coolingOffSeconds = Math.max(0, startTime
- System.currentTimeMillis()) / 1000;
synchronized(this) {
addedNodes = announcementAddedNodes;
refusedNodes =
announcementNotWantedNodes;
recentSentAnnouncements =
sentAnnouncements;
runningAnnouncements =
Announcer.this.runningAnnouncements;
+
}
Vector nodes =
node.peers.getSeedServerPeersVector();
for(int i=0;i<nodes.size();i++) {
@@ -436,6 +438,10 @@
Integer.toString(connectedSeednodes),
Integer.toString(disconnectedSeednodes)
}));
+ if(coolingOffSeconds > 0) {
+ sb.append(' ');
+ sb.append(l10n("coolingOff", "seconds",
Long.toString(coolingOffSeconds)));
+ }
}
return sb.toString();
}
@@ -478,4 +484,8 @@
return L10n.getString("Announcer."+key, patterns, values);
}
+ public String l10n(String key, String pattern, String value) {
+ return L10n.getString("Announcer."+key, pattern, value);
+ }
+
}
