[freenet-cvs] r20618 - in trunk/freenet/src/freenet: clients/http l10n

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-06-22 04:50:43 +0000 (Sun, 22 Jun 2008)
New Revision: 20618

Modified:
   trunk/freenet/src/freenet/clients/http/StartupToadlet.java
   trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
Log:
second part of bug #229: More entropy issues

Now the error message can be translated

Modified: trunk/freenet/src/freenet/clients/http/StartupToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StartupToadlet.java  2008-06-22 
04:42:52 UTC (rev 20617)
+++ trunk/freenet/src/freenet/clients/http/StartupToadlet.java  2008-06-22 
04:50:43 UTC (rev 20618)
@@ -1,5 +1,6 @@
 package freenet.clients.http;

+import freenet.l10n.L10n;
 import java.io.IOException;
 import java.net.URI;

@@ -27,21 +28,21 @@
                if(path.startsWith(StaticToadlet.ROOT_URL) && staticToadlet != 
null)
                        staticToadlet.handleGet(uri, req, ctx);
                else {
-                       String desc = "Freenet is starting up";
+                       String desc = L10n.getString("StartupToadlet.title");
                        HTMLNode pageNode = 
ctx.getPageMaker().getPageNode(desc, false, ctx);
                        HTMLNode headNode = 
ctx.getPageMaker().getHeadNode(pageNode);
                        headNode.addChild("meta", new String[]{"http-equiv", 
"content"}, new String[]{"refresh", "20; url="});
                        HTMLNode contentNode = 
ctx.getPageMaker().getContentNode(pageNode);

                        if(!isPRNGReady) {
-                               HTMLNode prngInfobox = 
contentNode.addChild(ctx.getPageMaker().getInfobox("infobox-error", desc));
+                               HTMLNode prngInfobox = 
contentNode.addChild(ctx.getPageMaker().getInfobox("infobox-error", 
L10n.getString("StartupToadlet.entropyErrorTitle")));
                                HTMLNode prngInfoboxContent = 
ctx.getPageMaker().getContentNode(prngInfobox);
-                               prngInfoboxContent.addChild("#", "There isn't 
enough entropy available on your system... Freenet won't start until it can 
gather enough.");
+                               prngInfoboxContent.addChild("#", 
L10n.getString("StartupToadlet.entropyErrorContent"));
                        }

                        HTMLNode infobox = 
contentNode.addChild(ctx.getPageMaker().getInfobox("infobox-error", desc));
                        HTMLNode infoboxContent = 
ctx.getPageMaker().getContentNode(infobox);
-                       infoboxContent.addChild("#", "Your freenet node is 
starting up, please hold on.");
+                       infoboxContent.addChild("#", 
L10n.getString("StartupToadlet.isStartingUp"));

                        WelcomeToadlet.maybeDisplayWrapperLogfile(ctx, 
contentNode);


Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties   2008-06-22 
04:42:52 UTC (rev 20617)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties   2008-06-22 
04:50:43 UTC (rev 20618)
@@ -1046,6 +1046,10 @@
 SSL.keyPassLong=Password of private key access
 SSL.version=Version of SSL
 SSL.versionLong=Version of SSL, SSLv3 or TLSv1 (default SSLv3)
+StartupToadlet.entropyErrorTitle=Not enough entropy is available!
+StartupToadlet.entropyErrorContent=There isn't enough entropy available on 
your system... Freenet won't start until it can gather enough.
+StartupToadlet.isStartingUp=Your freenet node is starting up, please hold on.
+StartupToadlet.title=Freenet is starting up
 StaticToadlet.pathInvalidChars=The given URI contains disallowed characters.
 StaticToadlet.pathNotFound=The path you specified doesn't exist.
 StaticToadlet.pathNotFoundTitle=Path Not Found