Author: toad
Date: 2007-04-28 20:05:19 +0000 (Sat, 28 Apr 2007)
New Revision: 13044
Modified:
trunk/freenet/src/freenet/clients/http/Toadlet.java
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
Log:
More keys
Modified: trunk/freenet/src/freenet/clients/http/Toadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/Toadlet.java 2007-04-28 19:57:30 UTC
(rev 13043)
+++ trunk/freenet/src/freenet/clients/http/Toadlet.java 2007-04-28 20:05:19 UTC
(rev 13044)
@@ -72,12 +72,12 @@
}
private void handleUnhandledRequest(URI uri, Bucket data,
ToadletContext toadletContext) throws ToadletContextClosedException,
IOException, RedirectException {
- HTMLNode pageNode =
toadletContext.getPageMaker().getPageNode("Not supported", toadletContext);
+ HTMLNode pageNode =
toadletContext.getPageMaker().getPageNode(l10n("notSupportedTitle"),
toadletContext);
HTMLNode contentNode =
toadletContext.getPageMaker().getContentNode(pageNode);
HTMLNode infobox = contentNode.addChild("div", "class",
"infobox infobox-error");
- infobox.addChild("div", "class", "infobox-header", "Not
supported");
- infobox.addChild("div", "class", "infobox-content", "Your
browser sent a request that Freenet ("+getClass().getName()+") could not
understand.");
+ infobox.addChild("div", "class", "infobox-header",
l10n("notSupportedTitle"));
+ infobox.addChild("div", "class", "infobox-content",
l10n("notSupportedWithClass", "class", getClass().getName()));
MultiValueTable hdrtbl = new MultiValueTable();
hdrtbl.put("Allow", this.supportedMethods());
@@ -88,6 +88,14 @@
toadletContext.writeData(pageBuffer.toString().getBytes());
}
+ private String l10n(String key, String pattern, String value) {
+ return L10n.getString("Toadlet."+key, new String[] { pattern },
new String[] { value });
+ }
+
+ private String l10n(String key) {
+ return L10n.getString("Toadlet."+key);
+ }
+
/**
* Which methods are supported by this Toadlet.
* Should return a string containing the methods supported, separated
by commas
@@ -155,8 +163,9 @@
if(msg == null) msg = "";
else msg = HTMLEncoder.encode(msg);
String redirDoc =
-
"<html><head><title>"+msg+"</title></head><body><h1>Permanent redirect: "+
- msg+"</h1><a
href=\""+HTMLEncoder.encode(location)+"\">Click here</a></body></html>";
+ "<html><head><title>"+msg+"</title></head><body><h1>" +
+ l10n("permRedirectWithReason", "reason", msg)+
+ "</h1><a
href=\""+HTMLEncoder.encode(location)+"\">"+l10n("clickHere")+"</a></body></html>";
byte[] buf;
try {
buf = redirDoc.getBytes("UTF-8");
@@ -174,8 +183,10 @@
if(msg == null) msg = "";
else msg = HTMLEncoder.encode(msg);
String redirDoc =
-
"<html><head><title>"+msg+"</title></head><body><h1>Temporary redirect: "+
- msg+"</h1><a
href=\""+HTMLEncoder.encode(location)+"\">Click here</a></body></html>";
+ "<html><head><title>"+msg+"</title></head><body><h1>" +
+ l10n("tempRedirectWithReason", "reason", msg)+
+ "</h1><a href=\""+HTMLEncoder.encode(location)+"\">" +
+ l10n("clickHere") + "</a></body></html>";
byte[] buf;
try {
buf = redirDoc.getBytes("UTF-8");
@@ -205,8 +216,8 @@
HTMLNode infoboxContent =
ctx.getPageMaker().getContentNode(infobox);
infoboxContent.addChild(message);
infoboxContent.addChild("br");
- infoboxContent.addChild("a", "href", ".", "Return to the
previous page.");
- infoboxContent.addChild("a", "href", "/", "Return to the main
page.");
+ infoboxContent.addChild("a", "href", ".",
l10n("returnToPrevPage"));
+ infoboxContent.addChild("a", "href", "/",
l10n("returnToNodeHomepage"));
writeReply(ctx, code, "text/html; charset=UTF-8", desc,
pageNode.generate());
}
@@ -236,8 +247,8 @@
// FIXME what is the modern (CSS/XHTML) equivalent of <pre>?
infoboxContent.addChild("pre", sw.toString());
infoboxContent.addChild("br");
- infoboxContent.addChild("a", "href", ".", "Return to the
previous page.");
- infoboxContent.addChild("a", "href", "/", "Return to the main
page.");
+ infoboxContent.addChild("a", "href", ".",
l10n("returnToPrevPage"));
+ infoboxContent.addChild("a", "href", "/",
l10n("returnToNodeHomepage"));
writeReply(ctx, 500, "text/html; charset=UTF-8", desc,
pageNode.generate());
}
@@ -245,7 +256,7 @@
protected void writeInternalError(Throwable t, ToadletContext ctx)
throws ToadletContextClosedException, IOException {
Logger.error(this, "Caught "+t, t);
String msg =
"<html><head><title>"+L10n.getString("Toadlet.internalErrorTitle")+
- "Internal
Error</title></head><body><h1>"+L10n.getString("Toadlet.internalErrorPleaseReport")+"</h1><pre>";
+
"</title></head><body><h1>"+L10n.getString("Toadlet.internalErrorPleaseReport")+"</h1><pre>";
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
t.printStackTrace(pw);
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-04-28
19:57:30 UTC (rev 13043)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-04-28
20:05:19 UTC (rev 13044)
@@ -2,6 +2,13 @@
Toadlet.internalErrorTitle=Internal Error
Toadlet.internalErrorPleaseReport=Internal error : please report
Toadlet.unauthorized=You are not permitted access to this page.
+Toadlet.notSupportedTitle=Not Supported
+Toadlet.notSupportedWithClass=Your browser sent a request that Freenet
(${class}) could not understand.
+Toadlet.permRedirectWithReason=Permanent redirect: ${reason}
+Toadlet.tempRedirectWithReason=Temporary redirect: ${reason}
+Toadlet.clickHere=Click here
+Toadlet.returnToNodeHomepage=Return to node homepage
+Toadlet.returnToPrevPage=Return to the previous page
BookmarkEditorToadlet.edit=Edit
BookmarkEditorToadlet.delete=Delete
BookmarkEditorToadlet.cut=Cut
