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

Timestamp:

2009-05-07T20:00:43+02:00 (16 years ago)

Author:

stoecker

Message:

close #2535 - patch by podolsir - NPE for missing icon, update translations, added et, nb, gl

File:

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

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

@@ -6 +6 @@
 import java.util.Comparator;
 import java.util.Locale;
+import java.util.LinkedList;
 import java.util.Vector;
 
@@ -58 +59 @@
     public static final Locale[] getAvailableTranslations() {
         Vector<Locale> v = new Vector<Locale>();
+        LinkedList<String>str = new LinkedList<String>();
         Locale[] l = Locale.getAvailableLocales();
         for (int i = 0; i < l.length; i++) {
-            String cn = TR_BASE + l[i];
+            String loc = l[i].toString();
+            String cn = TR_BASE + loc;
             try {
                 Class.forName(cn);
                 v.add(l[i]);
+                str.add(loc);
             } catch (ClassNotFoundException e) {
             }
         }
+        /* hmm, don't know why this is necessary */
+        try {
+          if(!str.contains("nb"))
+            v.add(new Locale("nb"));
+        } catch (Exception e) {}
+        try {
+          if(!str.contains("gl"))
+            v.add(new Locale("gl"));
+        } catch (Exception e) {}
         l = new Locale[v.size()];
         l = v.toArray(l);