[freenet-cvs] r20553 - trunk/freenet/src/freenet/l10n

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-06-21 10:42:24 +0000 (Sat, 21 Jun 2008)
New Revision: 20553

Modified:
   trunk/freenet/src/freenet/l10n/L10n.java
Log:
first part of bug #2424: FProxy chooses l10n from OS locale rather than 
language used for installer

We need the node to understand ISO 3 letters codes

Modified: trunk/freenet/src/freenet/l10n/L10n.java
===================================================================
--- trunk/freenet/src/freenet/l10n/L10n.java    2008-06-21 10:21:33 UTC (rev 
20552)
+++ trunk/freenet/src/freenet/l10n/L10n.java    2008-06-21 10:42:24 UTC (rev 
20553)
@@ -34,19 +34,19 @@
        public static final String FALLBACK_DEFAULT = "en";
        /** @see http://www.omniglot.com/language/names.htm */
        public static final String[][] AVAILABLE_LANGUAGES = {
-               new String[] { "en", "English" },
-               new String[] { "es", "Espa?ol" },
-               new String[] { "da", "Dansk" },
-               new String[] { "de", "Deutsch" },
-               new String[] { "fi", "Suomi" },
-               new String[] { "fr", "Fran?ais" },
-               new String[] { "it", "Italiano" },
-               new String[] { "no", "Norsk" },
-               new String[] { "pl", "Polski" },
-               new String[] { "se", "Svenska" },
-               new String[] { "zh-cn", "??(??)" },
-               new String[] { "zh-tw", "??(??)" },
-               new String[] { "unlisted", "unlisted"},
+               new String[] { "en", "English", "eng" },
+               new String[] { "es", "Espa?ol", "spa" },
+               new String[] { "da", "Dansk", "dan" },
+               new String[] { "de", "Deutsch", "deu" },
+               new String[] { "fi", "Suomi", "fin" },
+               new String[] { "fr", "Fran?ais", "fra" },
+               new String[] { "it", "Italiano", "ita" },
+               new String[] { "no", "Norsk", "nor" },
+               new String[] { "pl", "Polski", "pol" },
+               new String[] { "se", "Svenska", "svk" },
+               new String[] { "zh-cn", "??(??)", "chn" },
+               new String[] { "zh-tw", "??(??)", "zh-tw" },
+               new String[] { "unlisted", "unlisted", "unlisted"},
        };
        private final String selectedLanguage;

@@ -361,8 +361,9 @@
                for(int i=0; i<AVAILABLE_LANGUAGES.length; i++) {
                        String currentShortCode = AVAILABLE_LANGUAGES[i][0];
                        String currentLongName = AVAILABLE_LANGUAGES[i][1];
+                       String currentCountryCodeName = 
AVAILABLE_LANGUAGES[i][2];

-                       if(currentShortCode.equalsIgnoreCase(name) || 
currentLongName.equalsIgnoreCase(name))
+                       if(currentShortCode.equalsIgnoreCase(name) || 
currentLongName.equalsIgnoreCase(name) || 
currentCountryCodeName.equalsIgnoreCase(name))
                                return currentShortCode;
                }
                return null;