Changeset 2785 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2010-01-09T06:53:00+01:00 (14 years ago)

Author:

mjulius

Message:

treat 'en_US' default locale same as 'en'

File:

• trunk/src/org/openstreetmap/josm/tools/I18n.java (modified) (12 diffs)

trunk/src/org/openstreetmap/josm/tools/I18n.java

@@ -9 +9 @@
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.Locale;
-import java.util.MissingResourceException;
 import java.util.Vector;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
 /**
@@ -24 +21 @@
 public class I18n {
     private enum PluralMode { MODE_NOTONE, MODE_NONE, MODE_GREATERONE,
-    MODE_CS, MODE_AR, MODE_PL, MODE_RO, MODE_RU, MODE_SK, MODE_SL}
+        MODE_CS, MODE_AR, MODE_PL, MODE_RO, MODE_RU, MODE_SK, MODE_SL}
     private static PluralMode pluralMode = PluralMode.MODE_NOTONE; /* english default */
     private static HashMap<String, String> strings = null;
@@ -168 +165 @@
 
         /* try initial language settings, may be changed later again */
-        if(!load(Locale.getDefault().toString()))
+        if(!load(Locale.getDefault().toString())) {
             Locale.setDefault(Locale.ENGLISH);
+        }
     }
 
     private static boolean load(String l)
     {
-        if(l.equals("en"))
-        {
-          strings = null;
-          pstrings = null;
-          pluralMode = PluralMode.MODE_NOTONE;
-          return true;
+        if(l.equals("en") || l.equals("en_US"))
+        {
+            strings = null;
+            pstrings = null;
+            pluralMode = PluralMode.MODE_NOTONE;
+            return true;
         }
         URL en = Main.class.getResource("/data/en.lang");
@@ -188 +186 @@
         {
             int i = l.indexOf('_');
-            if (i > 0)
+            if (i > 0) {
                 l = l.substring(0, i);
+            }
             tr = Main.class.getResource("/data/"+l+".lang");
             if(tr == null)
@@ -211 +210 @@
                string
            }
-        */
+         */
         try
         {
             InputStream ens = new BufferedInputStream(en.openStream());
             InputStream trs = new BufferedInputStream(tr.openStream());
-            if(ens == null || trs == null)
-                return false;
             byte[] enlen = new byte[2];
             byte[] trlen = new byte[2];
@@ -230 +227 @@
                     if((ennum == -1 && trnum != -1) || (ennum != -1 && trnum == -1)) /* files do not match */
                         return false;
-                    if(ennum == -1) /* EOF */
+                    if(ennum == -1) {
                         break;
+                    }
                     String[] enstrings = new String[ennum];
                     String[] trstrings = new String[trnum];
@@ -240 +238 @@
                             return false;
                         val = (enlen[0] < 0 ? 256+enlen[0]:enlen[0])*256+(enlen[1] < 0 ? 256+enlen[1]:enlen[1]);
-                        if(val > str.length)
+                        if(val > str.length) {
                             str = new byte[val];
+                        }
                         int rval = ens.read(str, 0, val);
                         if(rval != val) /* file corrupt */
@@ -253 +252 @@
                             return false;
                         val = (trlen[0] < 0 ? 256+trlen[0]:trlen[0])*256+(trlen[1] < 0 ? 256+trlen[1]:trlen[1]);
-                        if(val > str.length)
+                        if(val > str.length) {
                             str = new byte[val];
+                        }
                         int rval = trs.read(str, 0, val);
                         if(rval != val) /* file corrupt */
@@ -260 +260 @@
                         trstrings[i] = new String(str, 0, val, "utf-8");
                     }
-                    if(trnum > 0)
+                    if(trnum > 0) {
                         p.put(enstrings[0], trstrings);
+                    }
                 }
                 else
@@ -269 +270 @@
                     if(enval != trval) /* files do not match */
                         return false;
-                    if(enval == -1) /* EOF */
+                    if(enval == -1) {
                         break;
+                    }
                     if(enval != 2) /* files corrupt */
                         return false;
@@ -283 +285 @@
                     else
                     {
-                        if(enval > str.length)
+                        if(enval > str.length) {
                             str = new byte[enval];
-                        if(trval > str.length)
+                        }
+                        if(trval > str.length) {
                             str = new byte[trval];
+                        }
                         int val = ens.read(str, 0, enval);
                         if(val != enval) /* file corrupt */
@@ -366 +370 @@
         case MODE_AR:
             return ((n == 0) ? 0 : ((n == 1) ? 1 : ((n == 2) ? 2 : ((((n % 100) >= 3)
-            && ((n % 100) <= 10)) ? 3 : ((((n % 100) >= 11) && ((n % 100) <= 99)) ? 4 : 5)))));
+                    && ((n % 100) <= 10)) ? 3 : ((((n % 100) >= 11) && ((n % 100) <= 99)) ? 4 : 5)))));
         case MODE_PL:
             return ((n == 1) ? 0 : (((((n % 10) >= 2) && ((n % 10) <= 4))
-            && (((n % 100) < 10) || ((n % 100) >= 20))) ? 1 : 2));
+                    && (((n % 100) < 10) || ((n % 100) >= 20))) ? 1 : 2));
         case MODE_RO:
             return ((n == 1) ? 0 : ((((n % 100) > 19) || (((n % 100) == 0) && (n != 0))) ? 2 : 1));
         case MODE_RU:
             return ((((n % 10) == 1) && ((n % 100) != 11)) ? 0 : (((((n % 10) >= 2)
-            && ((n % 10) <= 4)) && (((n % 100) < 10) || ((n % 100) >= 20))) ? 1 : 2));
+                    && ((n % 10) <= 4)) && (((n % 100) < 10) || ((n % 100) >= 20))) ? 1 : 2));
         case MODE_SK:
             return ((n == 1) ? 1 : (((n >= 2) && (n <= 4)) ? 2 : 0));
         case MODE_SL:
             return (((n % 100) == 1) ? 1 : (((n % 100) == 2) ? 2 : ((((n % 100) == 3)
-            || ((n % 100) == 4)) ? 3 : 0)));
+                    || ((n % 100) == 4)) ? 3 : 0)));
         }
         return 0;