Changeset 12644 in josm for trunk/src/org/openstreetmap/josm/tools/I18n.java

Timestamp:

2017-08-25T15:17:01+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - remove dependence of I18n on GUI

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
-import java.awt.GraphicsEnvironment;
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -22 +21 @@
 import java.util.jar.JarInputStream;
 import java.util.zip.ZipEntry;
-
-import javax.swing.JColorChooser;
-import javax.swing.JFileChooser;
-import javax.swing.UIManager;
-
-import org.openstreetmap.gui.jmapviewer.FeatureAdapter.TranslationAdapter;
-import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.gui.widgets.AbstractFileChooser;
 
 /**
@@ -95 +86 @@
     private static volatile String loadedCode = "en";
 
-    /* Localization keys for file chooser (and color chooser). */
-    private static final String[] JAVA_INTERNAL_MESSAGE_KEYS = new String[] {
-        /* JFileChooser windows laf */
-        "FileChooser.detailsViewActionLabelText",
-        "FileChooser.detailsViewButtonAccessibleName",
-        "FileChooser.detailsViewButtonToolTipText",
-        "FileChooser.fileAttrHeaderText",
-        "FileChooser.fileDateHeaderText",
-        "FileChooser.fileNameHeaderText",
-        "FileChooser.fileNameLabelText",
-        "FileChooser.fileSizeHeaderText",
-        "FileChooser.fileTypeHeaderText",
-        "FileChooser.filesOfTypeLabelText",
-        "FileChooser.homeFolderAccessibleName",
-        "FileChooser.homeFolderToolTipText",
-        "FileChooser.listViewActionLabelText",
-        "FileChooser.listViewButtonAccessibleName",
-        "FileChooser.listViewButtonToolTipText",
-        "FileChooser.lookInLabelText",
-        "FileChooser.newFolderAccessibleName",
-        "FileChooser.newFolderActionLabelText",
-        "FileChooser.newFolderToolTipText",
-        "FileChooser.refreshActionLabelText",
-        "FileChooser.saveInLabelText",
-        "FileChooser.upFolderAccessibleName",
-        "FileChooser.upFolderToolTipText",
-        "FileChooser.viewMenuLabelText",
-
-        /* JFileChooser gtk laf */
-        "FileChooser.acceptAllFileFilterText",
-        "FileChooser.cancelButtonText",
-        "FileChooser.cancelButtonToolTipText",
-        "FileChooser.deleteFileButtonText",
-        "FileChooser.filesLabelText",
-        "FileChooser.filterLabelText",
-        "FileChooser.foldersLabelText",
-        "FileChooser.newFolderButtonText",
-        "FileChooser.newFolderDialogText",
-        "FileChooser.openButtonText",
-        "FileChooser.openButtonToolTipText",
-        "FileChooser.openDialogTitleText",
-        "FileChooser.pathLabelText",
-        "FileChooser.renameFileButtonText",
-        "FileChooser.renameFileDialogText",
-        "FileChooser.renameFileErrorText",
-        "FileChooser.renameFileErrorTitle",
-        "FileChooser.saveButtonText",
-        "FileChooser.saveButtonToolTipText",
-        "FileChooser.saveDialogTitleText",
-
-        /* JFileChooser motif laf */
-        //"FileChooser.cancelButtonText",
-        //"FileChooser.cancelButtonToolTipText",
-        "FileChooser.enterFileNameLabelText",
-        //"FileChooser.filesLabelText",
-        //"FileChooser.filterLabelText",
-        //"FileChooser.foldersLabelText",
-        "FileChooser.helpButtonText",
-        "FileChooser.helpButtonToolTipText",
-        //"FileChooser.openButtonText",
-        //"FileChooser.openButtonToolTipText",
-        //"FileChooser.openDialogTitleText",
-        //"FileChooser.pathLabelText",
-        //"FileChooser.saveButtonText",
-        //"FileChooser.saveButtonToolTipText",
-        //"FileChooser.saveDialogTitleText",
-        "FileChooser.updateButtonText",
-        "FileChooser.updateButtonToolTipText",
-
-        /* gtk color chooser */
-        "GTKColorChooserPanel.blueText",
-        "GTKColorChooserPanel.colorNameText",
-        "GTKColorChooserPanel.greenText",
-        "GTKColorChooserPanel.hueText",
-        "GTKColorChooserPanel.nameText",
-        "GTKColorChooserPanel.redText",
-        "GTKColorChooserPanel.saturationText",
-        "GTKColorChooserPanel.valueText",
-
-        /* JOptionPane */
-        "OptionPane.okButtonText",
-        "OptionPane.yesButtonText",
-        "OptionPane.noButtonText",
-        "OptionPane.cancelButtonText"
-    };
+
     private static volatile Map<String, String> strings;
     private static volatile Map<String, String[]> pstrings;
@@ -679 +586 @@
     }
 
-    /**
-     * Localizations for file chooser dialog.
-     * For some locales (e.g. de, fr) translations are provided
-     * by Java, but not for others (e.g. ru, uk).
-     */
-    public static void translateJavaInternalMessages() {
-        Locale l = Locale.getDefault();
-
-        AbstractFileChooser.setDefaultLocale(l);
-        JFileChooser.setDefaultLocale(l);
-        JColorChooser.setDefaultLocale(l);
-        for (String key : JAVA_INTERNAL_MESSAGE_KEYS) {
-            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));
-            }
-        }
-    }
-
     private static int pluralEval(long n) {
         switch(pluralMode) {
@@ -732 +618 @@
         return 0;
     }
-
-    public static TranslationAdapter getTranslationAdapter() {
-        return I18n::tr;
-    }
-
-    /**
-     * Setup special font for Khmer script, as the default Java fonts do not display these characters.
-     *
-     * @since 8282
-     */
-    public static void setupLanguageFonts() {
-        // Use special font for Khmer script, as the default Java font do not display these characters
-        if ("km".equals(LanguageInfo.getJOSMLocaleCode())) {
-            Collection<String> fonts = Arrays.asList(
-                    GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames());
-            for (String f : new String[]{"Khmer UI", "DaunPenh", "MoolBoran"}) {
-                if (fonts.contains(f)) {
-                    GuiHelper.setUIFont(f);
-                    break;
-                }
-            }
-        }
-    }
 }