[freenet-cvs] r20617 - trunk/freenet/src/freenet/node

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-06-22 04:42:52 +0000 (Sun, 22 Jun 2008)
New Revision: 20617

Modified:
   trunk/freenet/src/freenet/node/Node.java
Log:
Set the L10n framework up asap in the startup process so that we can translate 
the StartupToadlet too

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2008-06-22 04:35:03 UTC (rev 
20616)
+++ trunk/freenet/src/freenet/node/Node.java    2008-06-22 04:42:52 UTC (rev 
20617)
@@ -623,13 +623,28 @@
                if(logConfigHandler != lc)
                        logConfigHandler=lc;
                startupTime = System.currentTimeMillis();
-               // Will be set up properly afterwards
-               L10n.setLanguage(L10n.FALLBACK_DEFAULT);
                SimpleFieldSet oldConfig = config.getSimpleFieldSet();
                // Setup node-specific configuration
                SubConfig nodeConfig = new SubConfig("node", config);
+               
                int sortOrder = 0;

+               // l10n stuffs
+               nodeConfig.register("l10n", 
Locale.getDefault().getLanguage().toLowerCase(), sortOrder++, false, true, 
+                               "Node.l10nLanguage",
+                               "Node.l10nLanguageLong",
+                               new L10nCallback());
+               
+               try {
+                       L10n.setLanguage(nodeConfig.getString("l10n"));
+               } catch (MissingResourceException e) {
+                       try {
+                               
L10n.setLanguage(nodeConfig.getOption("l10n").getDefault());
+                       } catch (MissingResourceException e1) {
+                               L10n.setLanguage(L10n.FALLBACK_DEFAULT);
+                       }
+               }
+               
                // FProxy config needs to be here too
                SubConfig fproxyConfig = new SubConfig("fproxy", config);
                try {
@@ -1564,23 +1579,7 @@
                });

                disableHangCheckers = 
nodeConfig.getBoolean("disableHangCheckers");
-               
-               // l10n stuffs
-               nodeConfig.register("l10n", 
Locale.getDefault().getLanguage().toLowerCase(), sortOrder++, false, true, 
-                               "Node.l10nLanguage",
-                               "Node.l10nLanguageLong",
-                               new L10nCallback());
-               
-               try {
-                       L10n.setLanguage(nodeConfig.getString("l10n"));
-               } catch (MissingResourceException e) {
-                       try {
-                               
L10n.setLanguage(nodeConfig.getOption("l10n").getDefault());
-                       } catch (MissingResourceException e1) {
-                               L10n.setLanguage(L10n.FALLBACK_DEFAULT);
-                       }
-               }
-               
+                               
                nodeConfig.finishedInitialization();
                writeNodeFile();