Changeset 104 in josm for src/org/openstreetmap/josm/Main.java

Timestamp:

2006-07-03T00:31:24+02:00 (18 years ago)

Author:

imi

Message:

• started i18n
• started "download incomplete ways" action
• added straight line selection mode

File:

• src/org/openstreetmap/josm/Main.java (modified) (9 diffs)

src/org/openstreetmap/josm/Main.java

@@ -1 +1 @@
 package org.openstreetmap.josm;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BorderLayout;
@@ -149 +150 @@
                 final Action aboutAction = new AboutAction();
 
-                final JMenu fileMenu = new JMenu("Files");
+                final JMenu fileMenu = new JMenu(tr("Files"));
                 fileMenu.setMnemonic('F');
                 fileMenu.add(openAction);
@@ -159 +160 @@
 
 
-                final JMenu connectionMenu = new JMenu("Connection");
+                final JMenu connectionMenu = new JMenu(tr("Connection"));
                 connectionMenu.setMnemonic('C');
                 connectionMenu.add(downloadAction);
+                //connectionMenu.add(new DownloadIncompleteAction());
                 connectionMenu.add(uploadAction);
                 mainMenu.add(connectionMenu);
 
-                layerMenu = new JMenu("Layer");
+                layerMenu = new JMenu(tr("Layer"));
                 layerMenu.setMnemonic('L');
                 mainMenu.add(layerMenu);
                 layerMenu.setVisible(false);
                 
-                final JMenu editMenu = new JMenu("Edit");
+                final JMenu editMenu = new JMenu(tr("Edit"));
                 editMenu.setMnemonic('E');
                 editMenu.add(undoAction);
@@ -179 +181 @@
 
                 mainMenu.add(new JSeparator());
-                final JMenu helpMenu = new JMenu("Help");
+                final JMenu helpMenu = new JMenu(tr("Help"));
                 helpMenu.setMnemonic('H');
                 helpMenu.add(aboutAction);
@@ -220 +222 @@
         public final OsmDataLayer editLayer() {
                 if (map == null || map.mapView.editLayer == null)
-                        addLayer(new OsmDataLayer(ds, "unnamed", false));
+                        addLayer(new OsmDataLayer(ds, tr("unnamed"), false));
                 return map.mapView.editLayer;
         }
@@ -270 +272 @@
                 } catch (final IOException e1) {
                         e1.printStackTrace();
-                        errMsg = "Preferences could not be loaded. Write default preference file to '"+pref.getPreferencesDir()+"preferences'.";
+                        errMsg = tr("Preferences could not be loaded. Write default preference file to '{0}'.",
+                    pref.getPreferencesDir() + "preferences");
                         Main.pref.resetToDefault();
                 }
@@ -280 +283 @@
                 } catch (final Exception e) {
                         e.printStackTrace();
-                        JOptionPane.showMessageDialog(null, "The projection could not be read from preferences. Using EPSG:4263.");
+                        JOptionPane.showMessageDialog(null, tr("The projection could not be read from preferences. Using EPSG:4263."));
                         Main.proj = new Epsg4326();
                 }
@@ -336 +339 @@
                         final Bounds b = DownloadAction.osmurl2bounds(s);
                         if (b == null)
-                                JOptionPane.showMessageDialog(Main.parent, "Ignoring malformed url: '"+s+"'");
+                                JOptionPane.showMessageDialog(Main.parent, tr("Ignoring malformed url: '{0}'", s));
                         else
                                 main.downloadAction.download(false, b.min.lat(), b.min.lon(), b.max.lat(), b.max.lon());
@@ -346 +349 @@
                                 main.openAction.openFile(new File(new URI(s)));
                         } catch (URISyntaxException e) {
-                                JOptionPane.showMessageDialog(Main.parent, "Ignoring malformed file url: '"+s+"'");
+                                JOptionPane.showMessageDialog(Main.parent, tr("Ignoring malformed file url: '{0}", s));
                         }
                         return;