Changeset 8721 in osm for applications/editors/josm

Timestamp:

2008-07-04T12:27:18+02:00 (16 years ago)

Author:

stoecker

Message:

fixed i18n a lot

Location:

applications/editors/josm/plugins/wmsplugin/src/wmsplugin

Files:

• DownloadWMSTask.java (modified) (1 diff)
• Help_WMSmenuAction.java (modified) (6 diffs)
• Map_Rectifier_WMSmenuAction.java (modified) (3 diffs)
• WMSAdjustAction.java (modified) (1 diff)
• WMSDownloadAction.java (modified) (2 diffs)
• WMSGrabber.java (modified) (2 diffs)
• WMSLayer.java (modified) (1 diff)
• WMSPlugin.java (modified) (4 diffs)
• WMSPreferenceEditor.java (modified) (2 diffs)

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/DownloadWMSTask.java

@@ -20 +20 @@
         
         public DownloadWMSTask(WMSLayer wmsLayer, Bounds bounds, double pixelPerDegree) {
-                super(tr("Downloading " + wmsLayer.name));
+                super(tr("Downloading {0}", wmsLayer.name));
 
                 this.wmsLayer = wmsLayer;

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java

@@ -1 +1 @@
 package wmsplugin;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -16 +18 @@
         public Help_WMSmenuAction() {
                 //super("Help / About");
-                super("help", "help", "Help  / About", 0, 0, false);
+                super(tr("help"), "help", tr("Help  / About"), 0, 0, false);
                 
         }
@@ -23 +25 @@
                 //todo - put this into a txt file? 
                   String helptext = 
-                        "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "  +
+                        tr("You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "  +
                         "these will then show up in the WMS menu.\n\n"+
                         
@@ -42 +44 @@
                         "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" +
                         " \n" +
-                        "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't use.\n"+
-                         "WMS Plugin version: "+ WMSPlugin.VERSION ;            
+                        "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't use.");
                 
                 JTextPane tp = new JTextPane();
@@ -51 +52 @@
                   
                   js.getViewport().add(tp);
-                  JFrame jf = new JFrame("WMS Plugin Help");
+                  JFrame jf = new JFrame(tr("WMS Plugin Help"));
                   jf.getContentPane().add(js);
                   jf.pack();
@@ -57 +58 @@
                   jf.setVisible(true); 
                   tp.setText(helptext);
-        
+        }
 }
-        
-}

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java

@@ -1 +1 @@
 package wmsplugin;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -16 +18 @@
 
         public Map_Rectifier_WMSmenuAction() {
-                super("Rectified Image ...", "OLmarker", "Download Rectified Image from Metacarta's Map Rectifer WMS", 0, 0, false);
+                super(tr("Rectified Image ..."), "OLmarker", tr("Download Rectified Image from Metacarta's Map Rectifer WMS"), 0, 0, false);
         }
 
         public void actionPerformed(ActionEvent e) {
-                String newid = JOptionPane.showInputDialog(Main.parent, "Metacarta Map Rectifier image id");
+                String newid = JOptionPane.showInputDialog(Main.parent, tr("Metacarta Map Rectifier image id"));
 
                 if (newid != null && !newid.equals("")) {
@@ -27 +29 @@
 
                         DownloadWMSTask.download(WMSDownloadAction.getLayer(
-                                new WMSInfo("rectifier id="+newid, newURL, -1)));
+                                new WMSInfo(tr("rectifier id={0}",newid), newURL, -1)));
                 }
         }

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java

@@ -24 +24 @@
 
         public WMSAdjustAction(MapFrame mapFrame) {
-                super("landsatAdjust", "movelandsat", 
-                                                "Adjust the position of the WMS layer", mapFrame, 
+                super(tr("landsatAdjust"), "movelandsat", 
+                                                tr("Adjust the position of the WMS layer"), mapFrame, 
                                                 ImageProvider.getCursor("normal", "move"));
         }

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java

@@ -1 +1 @@
 package wmsplugin;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -13 +15 @@
         
         public WMSDownloadAction(WMSInfo info) {
-                super(info.name, "wmsmenu", "Download WMS tile from "+info.name, 0, 0, false);
+                super(info.name, "wmsmenu", tr("Download WMS tile from {0}",info.name), 0, 0, false);
                 this.info = info;
         }

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java

@@ -1 +1 @@
 package wmsplugin;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.image.BufferedImage;
@@ -43 +45 @@
                 } catch (MalformedURLException e) {
                         throw (IOException) new IOException(
-                                "WMSGrabber: Illegal url.").initCause(e);
+                                tr("WMSGrabber: Illegal url.")).initCause(e);
                 }
         }

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java

@@ -51 +51 @@
 
         public WMSLayer() {
-                this("Blank Layer", null);
+                this(tr("Blank Layer"), null);
         }
 

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java

@@ -28 +28 @@
 public class WMSPlugin extends Plugin {
 
-        static String VERSION = "2.4";
-        
         WMSLayer wmsLayer;
         static JMenu wmsJMenu;
@@ -82 +80 @@
                 // if no (valid) prefs are set, initialize to a sensible default.
                 if (wmsList.isEmpty()) {
-                        WMSInfo landsatInfo = new WMSInfo("Landsat", 
+                        WMSInfo landsatInfo = new WMSInfo(tr("Landsat"),
                                         "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&"+
                                         "layers=global_mosaic&styles=&srs=EPSG:4326&"+
@@ -89 +87 @@
                         wmsList.add(landsatInfo);
                         
-                        WMSInfo npeInfo = new WMSInfo("NPE Maps", 
+                        WMSInfo npeInfo = new WMSInfo(tr("NPE Maps"),
                                         "http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&", 2);
                         npeInfo.save();
@@ -114 +112 @@
                 wmsJMenu.addSeparator();
                 wmsJMenu.add(new JMenuItem(new 
-                                JosmAction("Blank Layer", "blankmenu", "Open a blank WMS layer to load data from a file", 0, 0, false) {
+                                JosmAction(tr("Blank Layer"), "blankmenu", tr("Open a blank WMS layer to load data from a file"), 0, 0, false) {
                         public void actionPerformed(ActionEvent ev) {
                                 Main.main.addLayer(new WMSLayer());

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java

@@ -36 +36 @@
                 JPanel p = gui.createPreferenceTab("wms", tr("WMS Plugin Preferences"), tr("Modify list of WMS servers displayed in the WMS plugin menu"));
                 
-                model = new DefaultTableModel(new String[]{"#", "Menu Name", "WMS URL"}, 0) {
+                model = new DefaultTableModel(new String[]{"#", tr("Menu Name"), tr("WMS URL")}, 0) {
                         @Override public boolean isCellEditable(int row, int column) {
                                 return column != 0;
@@ -59 +59 @@
                         public void actionPerformed(ActionEvent e) {
                                 JPanel p = new JPanel(new GridBagLayout());
-                                p.add(new JLabel("Menu Name"), GBC.std().insets(0,0,5,0));
+                                p.add(new JLabel(tr("Menu Name")), GBC.std().insets(0,0,5,0));
                                 JTextField key = new JTextField(10);
                                 JTextField value = new JTextField(10);
                                 p.add(key, GBC.eop().insets(5,0,0,0).fill(GBC.HORIZONTAL));
-                                p.add(new JLabel("WMS URL"), GBC.std().insets(0,0,5,0));
+                                p.add(new JLabel(tr("WMS URL")), GBC.std().insets(0,0,5,0));
                                 p.add(value, GBC.eol().insets(5,0,0,0).fill(GBC.HORIZONTAL));
                                 int answer = JOptionPane.showConfirmDialog(gui, p, tr("Enter a menu name and WMS URL"), JOptionPane.OK_CANCEL_OPTION);