Changeset 3340 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-06-24T16:29:44+02:00 (14 years ago)

Author:

bastiK

Message:

fixed #5093 - translation for open file

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• tools/I18n.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -64 +64 @@
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
@@ -360 +361 @@
         UIManager.put("OptionPane.noIcon", UIManager.get("OptionPane.cancelIcon"));
 
+        I18n.fixJFileChooser();
+        
         // init default coordinate format
         //

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

@@ -12 +12 @@
 import java.util.Vector;
 
+import javax.swing.JColorChooser;
 import javax.swing.JFileChooser;
 import javax.swing.UIManager;
@@ -26 +27 @@
         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 String[] fileChooserDialogStringKeys = new String[] {
+
+    /* Localization keys for file chooser (and color chooser). */
+    private static final String[] jFileChooserLocalizationKeys = new String[] {
         /* windows laf */
         "FileChooser.detailsViewActionLabelText",
@@ -92 +95 @@
         //"FileChooser.saveDialogTitleText",
         "FileChooser.updateButtonText",
-        "FileChooser.updateButtonToolTipText"
-        };
+        "FileChooser.updateButtonToolTipText",
+
+        /* color chooser */
+        "GTKColorChooserPanel.blueText",
+        "GTKColorChooserPanel.colorNameText",
+        "GTKColorChooserPanel.greenText",
+        "GTKColorChooserPanel.hueText",
+        "GTKColorChooserPanel.nameText",
+        "GTKColorChooserPanel.redText",
+        "GTKColorChooserPanel.saturationText",
+        "GTKColorChooserPanel.valueText"
+    };
     private static HashMap<String, String> strings = null;
     private static HashMap<String, String[]> pstrings = null;
@@ -424 +437 @@
             if (load(localeName)) {
                 Locale.setDefault(l);
-                
-                // localization for file chooser dialog
-                JFileChooser.setDefaultLocale(l);
-                for (String key : fileChooserDialogStringKeys) {
-                    String us = UIManager.getString(key, Locale.US);
-                    String loc = UIManager.getString(key, l);
-                    // only provide custom translation if it is not already localized by Java
-                    if (us != null && us.equals(loc)) {
-                        UIManager.put(key, tr(us));
-                    }
-                }
             } else {
                 if (!l.getLanguage().equals("en")) {
@@ -443 +445 @@
                     pstrings = null;
                 }
+            }
+        }
+    }
+
+    /**
+     * Localizations for file chooser dialog.
+     * For some locals (e.g. de, fr) translations are provided
+     * by Java, but for others (e.g. ru, uk) it is not.
+     */
+    public static void fixJFileChooser() {
+        Locale l = Locale.getDefault();
+
+        JFileChooser.setDefaultLocale(l);
+        JColorChooser.setDefaultLocale(l);
+        for (String key : jFileChooserLocalizationKeys) {
+            String us = UIManager.getString(key, Locale.US);
+            String loc = UIManager.getString(key, l);
+            // only provide custom translation if it is not already localized by Java
+            if (us != null && us.equals(loc)) {
+                UIManager.put(key, tr(us));
             }
         }