Author: bombe
Date: 2007-10-27 19:58:05 +0000 (Sat, 27 Oct 2007)
New Revision: 15616
Modified:
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/PproxyToadlet.java
trunk/freenet/src/freenet/clients/http/QueueToadlet.java
trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
Log:
fix issue #1824: add lots of l10n keys
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2007-10-27
19:25:49 UTC (rev 15615)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2007-10-27
19:58:05 UTC (rev 15616)
@@ -52,7 +52,7 @@
}
if(!ctx.isAllowedFullAccess()) {
- super.sendErrorPage(ctx, 403, "Unauthorized",
L10n.getString("Toadlet.unauthorized"));
+ super.sendErrorPage(ctx, 403,
L10n.getString("Toadlet.unauthorizedTitle"),
L10n.getString("Toadlet.unauthorized"));
return;
}
@@ -117,7 +117,7 @@
public void handleGet(URI uri, HTTPRequest req, ToadletContext ctx)
throws ToadletContextClosedException, IOException {
if(!ctx.isAllowedFullAccess()) {
- super.sendErrorPage(ctx, 403, "Unauthorized",
L10n.getString("Toadlet.unauthorized"));
+ super.sendErrorPage(ctx, 403,
L10n.getString("Unauthorized"), L10n.getString("Toadlet.unauthorized"));
return;
}
@@ -139,7 +139,7 @@
HTMLNode nextTableCell = navigationTableRow;
for(int i=0; i<sc.length;i++){
- nextTableCell.addChild("td", "class",
"config_navigation").addChild("li").addChild("a", "href", '#'
+sc[i].getPrefix(), sc[i].getPrefix());
+ nextTableCell.addChild("td", "class",
"config_navigation").addChild("li").addChild("a", "href", '#'
+sc[i].getPrefix(), l10n(sc[i].getPrefix()));
}
contentNode.addChild(navigationBar);
}
@@ -183,7 +183,7 @@
if(displayedConfigElements>0) {
formNode.addChild("div", "class",
"configprefix", sc[i].getPrefix());
- formNode.addChild("a", "id", sc[i].getPrefix());
+ formNode.addChild("a", "id",
l10n(sc[i].getPrefix()));
formNode.addChild(configGroupUlNode);
}
}
@@ -216,12 +216,12 @@
if(value) {
result.addChild("option", new String[] { "value",
"selected" }, new String[] {
- "true", "selected" }, "true");
- result.addChild("option", "value", "false", "false");
+ "true", "selected" }, l10n("true"));
+ result.addChild("option", "value", "false",
l10n("false"));
} else {
- result.addChild("option", "value", "true", "true");
+ result.addChild("option", "value", "true",
l10n("true"));
result.addChild("option", new String[] { "value",
"selected" }, new String[] {
- "false", "selected" }, "false");
+ "false", "selected" }, l10n("false"));
}
return result;
Modified: trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2007-10-27 19:25:49 UTC (rev 15615)
+++ trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2007-10-27 19:58:05 UTC (rev 15616)
@@ -159,7 +159,7 @@
}
if(!ctx.isAllowedFullAccess()) {
- super.sendErrorPage(ctx, 403, "Unauthorized",
L10n.getString("Toadlet.unauthorized"));
+ super.sendErrorPage(ctx, 403,
L10n.getString("Toadlet.unauthorizedTitle"),
L10n.getString("Toadlet.unauthorized"));
return;
}
@@ -733,7 +733,7 @@
if (!advancedModeEnabled && (peerNodeStatus.getStatusValue() ==
PeerManager.PEER_NODE_STATUS_ROUTING_BACKED_OFF)) {
statusString = "BUSY";
}
- peerRow.addChild("td", "class", "peer-status").addChild("span",
"class", peerNodeStatus.getStatusCSSName(), statusString +
(peerNodeStatus.isFetchingARK() ? "*" : ""));
+ peerRow.addChild("td", "class", "peer-status").addChild("span",
"class", peerNodeStatus.getStatusCSSName(),
L10n.getString("ConnectionsToadlet.nodeStatus." + statusString) +
(peerNodeStatus.isFetchingARK() ? "*" : ""));
drawNameColumn(peerRow, peerNodeStatus);
Modified: trunk/freenet/src/freenet/clients/http/PproxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PproxyToadlet.java 2007-10-27
19:25:49 UTC (rev 15615)
+++ trunk/freenet/src/freenet/clients/http/PproxyToadlet.java 2007-10-27
19:58:05 UTC (rev 15616)
@@ -390,7 +390,7 @@
HTMLNode loadDiv = addForm.addChild("div");
loadDiv.addChild("#", (l10n("loadPluginLabel") + ' '));
loadDiv.addChild("input", new String[] { "type",
"name", "size" }, new String[] { "text", "load", "40" });
- loadDiv.addChild("input", new String[] { "type",
"value" }, new String[] { "submit", "Load" });
+ loadDiv.addChild("input", new String[] { "type",
"value" }, new String[] { "submit", l10n("Load") });
writeHTMLReply(ctx, 200, "OK", pageNode.generate());
}
}
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2007-10-27
19:25:49 UTC (rev 15615)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2007-10-27
19:58:05 UTC (rev 15616)
@@ -867,16 +867,16 @@
insertForm.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "radio", "keytype", "ksk" });
insertForm.addChild("#", " KSK \u00a0 ");
insertForm.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "text", "key", "KSK@" });
- insertForm.addChild("#", " \u00a0 File: ");
+ insertForm.addChild("#", " \u00a0 " +
L10n.getString("QueueToadlet.insertFileLabel") + ": ");
insertForm.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "file", "filename", "" });
insertForm.addChild("#", " \u00a0 ");
insertForm.addChild("input", new String[] { "type", "name",
"checked" }, new String[] { "checkbox", "compress", "checked" });
- insertForm.addChild("#", " Compress \u00a0 ");
- insertForm.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "submit", "insert", "Insert file" });
+ insertForm.addChild("#", " " +
L10n.getString("QueueToadlet.insertFileCompressLabel") + " \u00a0 ");
+ insertForm.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "submit", "insert",
L10n.getString("QueueToadlet.insertFileInsertFileLabel") });
insertForm.addChild("#", " \u00a0 ");
- insertForm.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "submit", "insert-local", "Browse..." });
+ insertForm.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "submit", "insert-local",
L10n.getString("QueueToadlet.insertFileBrowseLabel") + "..." });
insertForm.addChild("#", " \u00a0 ");
- insertForm.addChild("input", new String[] { "type", "name" },
new String[] { "reset", "Reset form" });
+ insertForm.addChild("input", new String[] { "type", "name" },
new String[] { "reset", L10n.getString("QueueToadlet.insertFileResetForm") });
return insertBox;
}
Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2007-10-27 19:25:49 UTC (rev 15615)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2007-10-27 19:58:05 UTC (rev 15616)
@@ -105,7 +105,7 @@
public void handleGet(URI uri, HTTPRequest request, ToadletContext ctx)
throws ToadletContextClosedException, IOException, RedirectException {
if(!ctx.isAllowedFullAccess()) {
- super.sendErrorPage(ctx, 403, "Unauthorized",
L10n.getString("Toadlet.unauthorized"));
+ super.sendErrorPage(ctx, 403,
L10n.getString("Toadlet.unauthorizedTitle"),
L10n.getString("Toadlet.unauthorized"));
return;
}
@@ -137,7 +137,7 @@
int numberOfListening = getPeerStatusCount(peerNodeStatuses,
PeerManager.PEER_NODE_STATUS_LISTENING);
int numberOfListenOnly = getPeerStatusCount(peerNodeStatuses,
PeerManager.PEER_NODE_STATUS_LISTEN_ONLY);
- HTMLNode pageNode = ctx.getPageMaker().getPageNode("Statistics
for " + node.getMyName(), ctx);
+ HTMLNode pageNode =
ctx.getPageMaker().getPageNode(l10n("fullTitle", new String[] { "name" }, new
String[] { node.getMyName() }), ctx);
HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
// FIXME! We need some nice images
@@ -165,7 +165,7 @@
drawJVMStatsBox(jvmStatsInfobox);
// Statistic gathering box
- HTMLNode statGatheringBox =
nextTableCell.addChild(ctx.getPageMaker().getInfobox("Statistic gathering"));
+ HTMLNode statGatheringBox =
nextTableCell.addChild(ctx.getPageMaker().getInfobox(l10n("statisticGatheringTitle")));
HTMLNode statGatheringContent =
ctx.getPageMaker().getContentNode(statGatheringBox);
// Generate a Thread-Dump
if(node.isUsingWrapper()){
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-10-27
19:25:49 UTC (rev 15615)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-10-27
19:58:05 UTC (rev 15616)
@@ -60,16 +60,46 @@
ConfigToadlet.appliedTitle=Configuration Applied
ConfigToadlet.apply=Apply
ConfigToadlet.configNavTitle=Configuration Navigation
+ConfigToadlet.console=console
ConfigToadlet.contributeTranslation=Contribute to the translation
ConfigToadlet.defaultIs=The default for that configuration option is:
'${default}'.
+ConfigToadlet.false=false
+ConfigToadlet.fcp=fcp
+ConfigToadlet.fproxy=fproxy
ConfigToadlet.fullTitle=Freenet Node Configuration of ${name}
+ConfigToadlet.logger=logger
+ConfigToadlet.node=node
+ConfigToadlet.node.load=node.load
+ConfigToadlet.node.opennet=node.opennet
+ConfigToadlet.node.scheduler=node.scheduler
+ConfigToadlet.node.testnet=node.testnet
+ConfigToadlet.node.updater=node.updater
+ConfigToadlet.pluginmanager=pluginmanager
+ConfigToadlet.pluginmanager2=pluginmanager2
ConfigToadlet.possibilitiesTitle=Your Possibilities
ConfigToadlet.reset=Reset
ConfigToadlet.returnToNodeConfig=Return to node configuration
ConfigToadlet.shortTitle=Configuration
ConfigToadlet.title=Freenet Node Configuration
+ConfigToadlet.toadletsymlinker=toadletsymlinker
+ConfigToadlet.true=true
ConfigurablePersister.doesNotExistCannotCreate=File does not exist and cannot
be created
ConfigurablePersister.existsCannotReadWrite=File exists and cannot read/write
it
+ConnectionsToadlet.nodeStatus.CONNECTED=CONNECTED
+ConnectionsToadlet.nodeStatus.BACKED OFF=BACKEDOFF
+ConnectionsToadlet.nodeStatus.TOO NEW=TOO NEW
+ConnectionsToadlet.nodeStatus.TOO OLD=TOO OLD
+ConnectionsToadlet.nodeStatus.DISCONNECTED=DISCONNECTED
+ConnectionsToadlet.nodeStatus.NEVER CONNECTED=NEVER CONNECTED
+ConnectionsToadlet.nodeStatus.DISABLED=DISABLED
+ConnectionsToadlet.nodeStatus.LISTEN ONLY=LISTEN ONLY
+ConnectionsToadlet.nodeStatus.LISTENING=LISTENING
+ConnectionsToadlet.nodeStatus.BURSTING=BURSTING
+ConnectionsToadlet.nodeStatus.CLOCK PROBLEM=CLOCK PROBLEM
+ConnectionsToadlet.nodeStatus.CONNECTION ERROR=CONNECTION ERROR
+ConnectionsToadlet.nodeStatus.DISCONNECTING=DISCONNECTING
+ConnectionsToadlet.nodeStatus.UNKNOWN STATUS=UNKNOWN STATUS
+ConnectionsToadlet.nodeStatus.BUSY=BUSY
ContentDataFilter.unknownCharset=The page you are about to display has an
unknown character set. This means that we are not able to filter the page, and
it may compromize your anonymity.
ContentDataFilter.unknownCharsetTitle=Unknown character set!
ContentDataFilter.warningUnknownCharsetTitle=Warning: Unknown character set
(${charset})
@@ -675,6 +705,7 @@
PproxyToadlet.downloadNotAllowedFromRemoteServer=Download of plugins is only
allowed from our server.
PproxyToadlet.Error=Error
PproxyToadlet.internalIDTitle=Internal ID
+PproxyToadlet.Load=Load
PproxyToadlet.loadPluginLabel=Load Plugin:
PproxyToadlet.noPlugins=No plugins loaded
PproxyToadlet.pluginNotFoundReload=The specified plugin could not be located
in order to reload it.
@@ -740,6 +771,11 @@
QueueToadlet.identifier=Identifier
QueueToadlet.insertAs=Insert as:
QueueToadlet.insertFile=Insert File
+QueueToadlet.insertFileLabel=File
+QueueToadlet.insertFileCompressLabel=Compress
+QueueToadlet.insertFileInsertFileLabel=Insert File
+QueueToadlet.insertFileBrowseLabel=Browse
+QueueToadlet.insertFileResetForm=Reset Form
QueueToadlet.key=Key
QueueToadlet.legend=Legend
QueueToadlet.mimeType=MIME Type
@@ -818,6 +854,7 @@
StatisticsToadlet.allocMemory=Allocated Java memory: ${memory}
StatisticsToadlet.bandwidthTitle=Bandwidth
StatisticsToadlet.cpus=Available CPUs: ${count}
+StatisticsToadlet.fullTitle=Statistics for ${name}
StatisticsToadlet.getLogs=Get latest node's logfile
StatisticsToadlet.inputRate=Input Rate: ${rate}/sec (of ${max})
StatisticsToadlet.jeDumpButton=Generate a JE Dump
@@ -832,6 +869,7 @@
StatisticsToadlet.outputRate=Output Rate: ${rate}/sec (of ${max})
StatisticsToadlet.payloadOutput=Payload Output: ${total}
(${rate}/sec)(${percent}%)
StatisticsToadlet.peerStatsTitle=Peer statistics
+StatisticsToadlet.statisticGatheringTitle=Statistics Gathering
StatisticsToadlet.threadDumpButton=Generate a Thread Dump
StatisticsToadlet.threads=Running threads: ${running}/${max}
StatisticsToadlet.totalInput=Total Input: ${total} (${rate}/sec)
@@ -872,6 +910,7 @@
Toadlet.returnToNodeHomepage=Return to node homepage
Toadlet.returnToPrevPage=Return to the previous page
Toadlet.tempRedirectWithReason=Temporary redirect: ${reason}
+Toadlet.unauthorizedTitle=Unauthorized
Toadlet.unauthorized=You are not permitted access to this page.
Toadlet.homepage=Homepage
ToadletContextImpl.cannotParseContentLength=Content-length parse error:
${error}
