Changeset 20217 in osm for applications/editors/josm

Timestamp:

2010-02-28T18:59:14+01:00 (14 years ago)

Author:

stoecker

Message:

i18n fixes

Location:

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer

Files:

• CalibrationFileFilter.java (modified) (2 diffs)
• HelpAction.java (deleted)
• LoadPictureCalibrationAction.java (modified) (3 diffs)
• MovePictureAction.java (modified) (2 diffs)
• NewLayerFromClipboardAction.java (modified) (2 diffs)
• NewLayerFromFileAction.java (modified) (3 diffs)
• PicLayerAbstract.java (modified) (5 diffs)
• PicLayerFromClipboard.java (modified) (3 diffs)
• PicLayerPlugin.java (modified) (1 diff)
• ResetPictureAllAction.java (modified) (2 diffs)
• ResetPictureAngleAction.java (modified) (2 diffs)
• ResetPicturePositionAction.java (modified) (2 diffs)
• ResetPictureScaleAction.java (modified) (2 diffs)
• RotatePictureAction.java (modified) (2 diffs)
• SavePictureCalibrationAction.java (modified) (3 diffs)
• ScaleXPictureAction.java (modified) (2 diffs)
• ScaleXYPictureAction.java (modified) (2 diffs)
• ScaleYPictureAction.java (modified) (2 diffs)

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java

@@ -19 +19 @@
  ***************************************************************************/
 package org.openstreetmap.josm.plugins.piclayer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.File;
@@ -44 +46 @@
         @Override
         public String getDescription() {
-                return "Calibration Files (*" + EXTENSION + ")";
+                return tr("Calibration Files")+ " (*" + EXTENSION + ")";
         }
-
 }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java

@@ -20 +20 @@
 
 package org.openstreetmap.josm.plugins.piclayer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
 import java.io.File;
@@ -48 +51 @@
          */
         public LoadPictureCalibrationAction( PicLayerAbstract owner ) {
-                super("Load Picture Calibration...", null, "Loads calibration data to a file", null, false);
+                super(tr("Load Picture Calibration..."), null, tr("Loads calibration data to a file"), null, false);
                 // Remember the owner...
                 m_owner = owner;
@@ -74 +77 @@
                                 // Error
                                 e.printStackTrace();
-                                JOptionPane.showMessageDialog(Main.parent , "Loading file failed: " + e.getMessage());
+                                JOptionPane.showMessageDialog(Main.parent , tr("Loading file failed: {0}", e.getMessage()));
                         }
-                }       
+                }
         }
 }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java

@@ -20 +20 @@
 
 package org.openstreetmap.josm.plugins.piclayer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.MouseEvent;
@@ -51 +53 @@
          */
         public MovePictureAction(MapFrame frame) {
-                super("PicLayer", "move", "Drag to move the picture", frame, ImageProvider.getCursor("crosshair", null));
+                super(tr("PicLayer move"), "move", tr("Drag to move the picture"), frame, ImageProvider.getCursor("crosshair", null));
         }
 

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromClipboardAction.java

@@ -21 +21 @@
 package org.openstreetmap.josm.plugins.piclayer;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
 import java.io.IOException;
@@ -38 +40 @@
          */
         public NewLayerFromClipboardAction() {
-                super("New picture layer from clipboard", null, null, null, false);
+                super(tr("New picture layer from clipboard"), null, null, null, false);
         }
 

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java

@@ -20 +20 @@
 
 package org.openstreetmap.josm.plugins.piclayer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -60 +62 @@
                 @Override
                 public String getDescription() {
-                        return "Image files";
+                        return tr("Image files");
                 }
                 
@@ -69 +71 @@
          */
         public NewLayerFromFileAction() {
-                super("New picture layer from file...", null, null, null, false);
+                super(tr("New picture layer from file..."), null, null, null, false);
         }
 

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java

@@ -20 +20 @@
 
 package org.openstreetmap.josm.plugins.piclayer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Color;
@@ -93 +95 @@
         // Create popup menu
         // Reset submenu
-        JMenu reset_submenu = new JMenu( "Reset" );
+        JMenu reset_submenu = new JMenu(tr("Reset"));
         reset_submenu.add( new ResetPictureAllAction( this ) );
         reset_submenu.addSeparator();
@@ -105 +107 @@
                 new JMenuItem( new SavePictureCalibrationAction(this)),
                 new JMenuItem( new LoadPictureCalibrationAction(this)),
-                new JSeparator(),
-                new JMenuItem( new HelpAction() )
         };
 
@@ -122 +122 @@
         Image image = createImage();
         if ( image == null ) {
-            throw new IOException( "Image not created properly.");
+            throw new IOException(tr("Image not created properly."));
         }
         // Convert to Buffered Image - not sure if this is the right way...
@@ -136 +136 @@
             m_initial_scale = Main.map.mapView.getDist100Pixel();
         } else {
-            throw new IOException( "Could not find the map object." );
+            throw new IOException(tr("Could not find the map object."));
         }
     }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromClipboard.java

@@ -21 +21 @@
 package org.openstreetmap.josm.plugins.piclayer;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.Image;
 import java.awt.Toolkit;
@@ -41 +43 @@
         // Check result
         if ( t == null ) {
-                throw new IOException( "Nothing in clipboard" );
+                throw new IOException(tr("Nothing in clipboard"));
         }
         
@@ -50 +52 @@
                 image = (Image)t.getTransferData(DataFlavor.imageFlavor);
             } else {
-                throw new IOException( "The clipboard data is not an image" );
+                throw new IOException(tr("The clipboard data is not an image"));
             }
         } catch (UnsupportedFlavorException e) {

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java

@@ -70 +70 @@
             m_menu.add( m_newFromFileAction = new NewLayerFromFileAction() );
             m_menu.add( m_newFromClipAction = new NewLayerFromClipboardAction() );
-            m_menu.addSeparator();
-            m_menu.add( new HelpAction() );
             m_newFromFileAction.setEnabled( false );
             m_newFromClipAction.setEnabled( false );

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java

@@ -20 +20 @@
 
 package org.openstreetmap.josm.plugins.piclayer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
 
@@ -39 +42 @@
          */
         public ResetPictureAllAction( PicLayerAbstract owner ) {
-                super("All", null, "Resets picture calibration", null, false);
+                super(tr("All"), null, tr("Resets picture calibration"), null, false);
                 // Remember the owner...
                 m_owner = owner;

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAngleAction.java

@@ -20 +20 @@
 
 package org.openstreetmap.josm.plugins.piclayer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
 
@@ -39 +42 @@
          */
         public ResetPictureAngleAction( PicLayerAbstract owner ) {
-                super("Angle", null, "Resets picture rotation", null, false);
+                super(tr("Angle"), null, tr("Resets picture rotation"), null, false);
                 // Remember the owner...
                 m_owner = owner;

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPicturePositionAction.java

@@ -20 +20 @@
 
 package org.openstreetmap.josm.plugins.piclayer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
 
@@ -39 +42 @@
          */
         public ResetPicturePositionAction( PicLayerAbstract owner ) {
-                super("Position", null, "Resets picture position", null, false);
+                super(tr("Reset position"), null, tr("Resets picture position"), null, false);
                 // Remember the owner...
                 m_owner = owner;

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureScaleAction.java

@@ -20 +20 @@
 
 package org.openstreetmap.josm.plugins.piclayer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
 
@@ -39 +42 @@
          */
         public ResetPictureScaleAction( PicLayerAbstract owner ) {
-                super("Scale", null, "Resets picture scale", null, false);
+                super(tr("Scale"), null, tr("Resets picture scale"), null, false);
                 // Remember the owner...
                 m_owner = owner;

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java

@@ -20 +20 @@
 
 package org.openstreetmap.josm.plugins.piclayer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.MouseEvent;
@@ -50 +52 @@
          */
         public RotatePictureAction(MapFrame frame) {
-                super("PicLayer", "rotate", "Drag to rotate the picture", frame, ImageProvider.getCursor("crosshair", null));
+                super(tr("PicLayer rotate"), "rotate", tr("Drag to rotate the picture"), frame, ImageProvider.getCursor("crosshair", null));
                 // TODO Auto-generated constructor stub
         }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java

@@ -20 +20 @@
 
 package org.openstreetmap.josm.plugins.piclayer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
 import java.io.File;
@@ -47 +50 @@
          */
         public SavePictureCalibrationAction( PicLayerAbstract owner ) {
-                super("Save Picture Calibration...", null, "Saves calibration data to a file", null, false);
+                super(tr("Save Picture Calibration..."), null, tr("Saves calibration data to a file"), null, false);
                 // Remember the owner...
                 m_owner = owner;
@@ -76 +79 @@
                         m_owner.saveCalibration(props);
                         try {
-                                props.store(new FileOutputStream(file), "JOSM PicLayer plugin calibration data");
+                                props.store(new FileOutputStream(file), tr("JOSM PicLayer plugin calibration data"));
                         } catch (Exception e) {
                                 // Error
                                 e.printStackTrace();
-                                JOptionPane.showMessageDialog(Main.parent , "Saving file failed: " + e.getMessage());
+                                JOptionPane.showMessageDialog(Main.parent , tr("Saving file failed: {0}", e.getMessage()));
                         }
                 }       

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java

@@ -21 +21 @@
 package org.openstreetmap.josm.plugins.piclayer;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
@@ -37 +39 @@
          */
         public ScaleXPictureAction(MapFrame frame) {
-                super("PicLayer", "scale_x", "Drag to scale the picture in the X Axis", frame);
+                super(tr("PicLayer scale X"), "scale_x", tr("Drag to scale the picture in the X Axis"), frame);
                 // TODO Auto-generated constructor stub
         }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java

@@ -21 +21 @@
 package org.openstreetmap.josm.plugins.piclayer;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
@@ -37 +39 @@
          */
         public ScaleXYPictureAction(MapFrame frame) {
-                super("PicLayer", "scale", "Drag to scale the picture in the X and Y Axis", frame);
+                super(tr("PicLayer scale"), "scale", tr("Drag to scale the picture in the X and Y Axis"), frame);
                 // TODO Auto-generated constructor stub
         }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java

@@ -21 +21 @@
 package org.openstreetmap.josm.plugins.piclayer;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
@@ -37 +39 @@
          */
         public ScaleYPictureAction(MapFrame frame) {
-                super("PicLayer", "scale_y", "Drag to scale the picture in the Y Axis", frame);
+                super(tr("PicLayer scale Y"), "scale_y", tr("Drag to scale the picture in the Y Axis"), frame);
                 // TODO Auto-generated constructor stub
         }