Changeset 104 in josm for src/org/openstreetmap/josm/actions/UploadAction.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/actions/UploadAction.java (modified) (9 diffs)

src/org/openstreetmap/josm/actions/UploadAction.java

@@ -1 +1 @@
 package org.openstreetmap.josm.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.GridBagLayout;
@@ -32 +34 @@
  */
 public class UploadAction extends JosmAction {
-
         public UploadAction() {
-                super("Upload to OSM", "upload", "Upload all changes to the OSM server.", "Ctrl-Shift-U", 
+                super(tr("Upload to OSM"), "upload", tr("Upload all changes to the OSM server."), tr("Ctrl-Shift-U"), 
                                 KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK));
         }
@@ -40 +41 @@
         public void actionPerformed(ActionEvent e) {
                 if (Main.map == null) {
-                        JOptionPane.showMessageDialog(Main.parent, "Nothing to upload. Get some data first.");
+                        JOptionPane.showMessageDialog(Main.parent,tr("Nothing to upload. Get some data first."));
                         return;
                 }
                 
                 if (!Main.map.conflictDialog.conflicts.isEmpty()) {
-                        JOptionPane.showMessageDialog(Main.parent, "There are unresolved conflicts. You have to resolve these first.");
+                        JOptionPane.showMessageDialog(Main.parent,tr("There are unresolved conflicts. You have to resolve these first."));
                         Main.map.conflictDialog.action.button.setSelected(true);
                         Main.map.conflictDialog.action.actionPerformed(null);
@@ -72 +73 @@
                 all.addAll(delete);
 
-                PleaseWaitRunnable uploadTask = new PleaseWaitRunnable("Uploading data"){
+                PleaseWaitRunnable uploadTask = new PleaseWaitRunnable(tr("Uploading data")){
                         @Override protected void realRun() throws SAXException {
                                 server.setProgressInformation(currentAction, progress);
@@ -96 +97 @@
         private boolean displayUploadScreen(Collection<OsmPrimitive> add, Collection<OsmPrimitive> update, Collection<OsmPrimitive> delete) {
                 if (add.isEmpty() && update.isEmpty() && delete.isEmpty()) {
-                        JOptionPane.showMessageDialog(Main.parent, "No changes to upload.");
+                        JOptionPane.showMessageDialog(Main.parent,tr("No changes to upload."));
                         return false;
                 }
@@ -105 +106 @@
 
                 if (!add.isEmpty()) {
-                        p.add(new JLabel("Objects to add:"), GBC.eol());
+                        p.add(new JLabel(tr("Objects to add:")), GBC.eol());
                         JList l = new JList(add.toArray());
                         l.setCellRenderer(renderer);
@@ -113 +114 @@
 
                 if (!update.isEmpty()) {
-                        p.add(new JLabel("Objects to modify:"), GBC.eol());
+                        p.add(new JLabel(tr("Objects to modify:")), GBC.eol());
                         JList l = new JList(update.toArray());
                         l.setCellRenderer(renderer);
@@ -121 +122 @@
 
                 if (!delete.isEmpty()) {
-                        p.add(new JLabel("Objects to delete:"), GBC.eol());
+                        p.add(new JLabel(tr("Objects to delete:")), GBC.eol());
                         JList l = new JList(delete.toArray());
                         l.setCellRenderer(renderer);
@@ -128 +129 @@
                 }
 
-                return JOptionPane.showConfirmDialog(Main.parent, p, "Upload this changes?", 
+                return JOptionPane.showConfirmDialog(Main.parent, p, tr("Upload this changes?"), 
                                 JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
         }