Changeset 1065 in josm for trunk/src/org

Timestamp:

2008-11-02T15:06:01+01:00 (16 years ago)

Author:

stoecker

Message:

language handling fixed

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• gui/MainApplication.java (modified) (1 diff)
• gui/preferences/LanguagePreference.java (added)
• gui/preferences/PreferenceDialog.java (modified) (1 diff)
• tools/I18n.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -404 +404 @@
         synchronized public Collection<String> getCollection(String key, Collection<String> def) {
                 String s = get(key);
-                if(s != null)
+                if(s != null && s.length() != 0)
                 {
                         /* handle old comma separated stuff - remove in future */

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -173 +173 @@
                     localeName = (String)(args.get("language").toArray()[0]);
                 
-                //TODO: Check preferences for language
-        
-                //If override then set new default locale - otherwise, override
-        if (localeName != null) {
-            Locale.setDefault(new Locale(localeName));
-        }
-        
+                if (localeName == null) {
+                        localeName = Main.pref.get("language", null);
+                }
+
+                if (localeName != null) {
+                        Locale l;
+                        int i = localeName.indexOf('_');
+                        if (i > 0) {
+                                l = new Locale(localeName.substring(0, i), localeName.substring(i + 1));
+                        } else {
+                                l = new Locale(localeName);
+                        }
+                        Locale.setDefault(l);
+                }
         try {
             i18n = I18nFactory.getI18n(MainApplication.class);

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -123 +123 @@
                 // order is important!
                 settings.add(new LafPreference());
+                settings.add(new LanguagePreference());
                 settings.add(new DrawingPreference());
                 settings.add(new ColorPreference());

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

@@ -3 +3 @@
 
 import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Locale;
+import java.util.Vector;
 
 /**
@@ -10 +14 @@
  */
 public class I18n {
+
+        /* Base name for translation data. Used for detecting available translations */
+        private static final String TR_BASE = "org.openstreetmap.josm.i18n.Translation_";
+
         /**
          * Set by MainApplication. Changes here later will probably mess up everything, because
@@ -43 +51 @@
                 return i18n.trn(text, pluralText, n);
         }
+
+        /**
+         * Get a list of all available JOSM Translations.
+         * @return an array of locale objects.
+         */
+        public static final Locale[] getAvailableTranslations() {
+                Vector<Locale> v = new Vector<Locale>();
+                Locale[] l = Locale.getAvailableLocales();
+                for (int i = 0; i < l.length; i++) {
+                        String cn = TR_BASE + l[i];
+                        try {
+                                Class.forName(cn);
+                                v.add(l[i]);
+                        } catch (ClassNotFoundException e) {
+                        }
+                }
+                l = new Locale[v.size()];
+                l = v.toArray(l);
+                Arrays.sort(l, new Comparator<Locale>() {
+                        public int compare(Locale o1, Locale o2) {
+                                return o1.toString().compareTo(o2.toString());
+                        }
+                });
+                return l;
+        }
 }