[freenet-cvs] r14511 - trunk/freenet/src/freenet/clients/http

[toad at freenetproject.org]

Author: toad
Date: 2007-08-07 16:16:40 +0000 (Tue, 07 Aug 2007)
New Revision: 14511

Modified:
   trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
   trunk/freenet/src/freenet/clients/http/PageMaker.java
Log:
Dynamically update the language for the title bar. Also fixes it's-always-in-english bug.

Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java	2007-08-07 16:11:06 UTC (rev 14510)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java	2007-08-07 16:16:40 UTC (rev 14511)
@@ -581,10 +581,10 @@
 			core.random.nextBytes(random);
 			FProxyToadlet fproxy = new FProxyToadlet(client, core);
 			core.setFProxy(fproxy);
-			server.register(fproxy, "/", false, l10n("welcomeTitle"), l10n("welcome"), false, null);
+			server.register(fproxy, "/", false, "FProxyToadlet.welcomeTitle", "FProxyToadlet.welcome", false, null);
 			
 			PproxyToadlet pproxy = new PproxyToadlet(client, node, core);
-			server.register(pproxy, "/plugins/", true, l10n("pluginsTitle"), l10n("plugins"), true, null);
+			server.register(pproxy, "/plugins/", true, "FProxyToadlet.pluginsTitle", "FProxyToadlet.plugins", true, null);
 			
 			WelcomeToadlet welcometoadlet = new WelcomeToadlet(client, core, node);
 			server.register(welcometoadlet, "/welcome/", true, false);
@@ -593,7 +593,7 @@
 			server.register(pluginToadlet, "/plugin/", true, true);
 			
 			ConfigToadlet configtoadlet = new ConfigToadlet(client, config, node, core);
-			server.register(configtoadlet, "/config/", true, l10n("configTitle"), l10n("config"), true, null);
+			server.register(configtoadlet, "/config/", true, "FProxyToadlet.configTitle", "FProxyToadlet.config", true, null);
 			
 			StaticToadlet statictoadlet = new StaticToadlet(client);
 			server.register(statictoadlet, "/static/", true, false);
@@ -603,20 +603,20 @@
 			
 			DarknetConnectionsToadlet friendsToadlet = new DarknetConnectionsToadlet(node, core, client);
 //			server.register(friendsToadlet, "/darknet/", true, l10n("friendsTitle"), l10n("friends"), true);
-			server.register(friendsToadlet, "/friends/", true, l10n("friendsTitle"), l10n("friends"), true, null);
+			server.register(friendsToadlet, "/friends/", true, "FProxyToadlet.friendsTitle", "FProxyToadlet.friends", true, null);
 			
 			OpennetConnectionsToadlet opennetToadlet = new OpennetConnectionsToadlet(node, core, client);
 //			server.register(opennetToadlet, "/opennet/", true, l10n("opennetTitle"), l10n("opennet"), true, opennetToadlet);
-			server.register(opennetToadlet, "/strangers/", true, l10n("opennetTitle"), l10n("opennet"), true, opennetToadlet);
+			server.register(opennetToadlet, "/strangers/", true, "FProxyToadlet.opennetTitle", "FProxyToadlet.opennet", true, opennetToadlet);
 			
 			N2NTMToadlet n2ntmToadlet = new N2NTMToadlet(node, core, client);
 			server.register(n2ntmToadlet, "/send_n2ntm/", true, true);
 			
 			QueueToadlet queueToadlet = new QueueToadlet(core, core.getFCPServer(), client);
-			server.register(queueToadlet, "/queue/", true, l10n("queueTitle"), l10n("queue"), false, null);
+			server.register(queueToadlet, "/queue/", true, "FProxyToadlet.queueTitle", "FProxyToadlet.queue", false, null);
 			
 			StatisticsToadlet statisticsToadlet = new StatisticsToadlet(node, core, client);
-			server.register(statisticsToadlet, "/stats/", true, l10n("statsTitle"), l10n("stats"), true, null);
+			server.register(statisticsToadlet, "/stats/", true, "FProxyToadlet.statsTitle", "FProxyToadlet.stats", true, null);
 			
 			LocalFileInsertToadlet localFileInsertToadlet = new LocalFileInsertToadlet(core, client);
 			server.register(localFileInsertToadlet, "/files/", true, false);

Modified: trunk/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PageMaker.java	2007-08-07 16:11:06 UTC (rev 14510)
+++ trunk/freenet/src/freenet/clients/http/PageMaker.java	2007-08-07 16:16:40 UTC (rev 14511)
@@ -117,7 +117,7 @@
 				String navigationTitle = (String) navigationLinkTitles.get(navigationLink);
 				String navigationPath = (String) navigationLinks.get(navigationLink);
 				HTMLNode listItem = navbarUl.addChild("li");
-				listItem.addChild("a", new String[] { "href", "title" }, new String[] { navigationPath, navigationTitle }, navigationLink);
+				listItem.addChild("a", new String[] { "href", "title" }, new String[] { navigationPath, L10n.getString(navigationTitle) }, L10n.getString(navigationLink));
 			}
 		}
 		HTMLNode contentDiv = pageDiv.addChild("div", "id", "content");