[freenet-cvs] r13438 - in trunk/freenet/src/freenet: l10n node

[t...@freenetproject.org]

Author: toad
Date: 2007-06-01 12:06:01 +0000 (Fri, 01 Jun 2007)
New Revision: 13438

Modified:
   trunk/freenet/src/freenet/l10n/L10n.java
   trunk/freenet/src/freenet/node/Node.java
Log:
Try the set value, then the default value, then english

Modified: trunk/freenet/src/freenet/l10n/L10n.java
===================================================================
--- trunk/freenet/src/freenet/l10n/L10n.java    2007-06-01 12:02:47 UTC (rev 
13437)
+++ trunk/freenet/src/freenet/l10n/L10n.java    2007-06-01 12:06:01 UTC (rev 
13438)
@@ -36,6 +36,7 @@
        public static final String OVERRIDE_SUFFIX = ".override" + SUFFIX;

        // English has to remain the first one!
+       public static final String FALLBACK_DEFAULT = "en";
        public static final String[] AVAILABLE_LANGUAGES = { "en", "fr", "pl", 
"it", "se", "no", "unlisted" };
        private final String selectedLanguage;


Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2007-06-01 12:02:47 UTC (rev 
13437)
+++ trunk/freenet/src/freenet/node/Node.java    2007-06-01 12:06:01 UTC (rev 
13438)
@@ -1408,7 +1408,7 @@

                disableHangCheckers = 
nodeConfig.getBoolean("disableHangCheckers");

-               // l10n stuffs          
+               // l10n stuffs
                nodeConfig.register("l10n", 
Locale.getDefault().getLanguage().toLowerCase(), sortOrder++, false, true, 
                                "Node.l10nLanguage",
                                "Node.l10nLanguageLong",
@@ -1417,7 +1417,11 @@
                try {
                        L10n.setLanguage(nodeConfig.getString("l10n"));
                } catch (MissingResourceException e) {
-                       
L10n.setLanguage(nodeConfig.getOption("l10n").getDefault());
+                       try {
+                               
L10n.setLanguage(nodeConfig.getOption("l10n").getDefault());
+                       } catch (MissingResourceException e1) {
+                               L10n.setLanguage(L10n.FALLBACK_DEFAULT);
+                       }
                }

                nodeConfig.finishedInitialization();