Changeset 25887 in osm for applications/editors

Timestamp:

2011-04-23T23:23:10+02:00 (13 years ago)

Author:

stoecker

Message:

fix i18n issue

Location:

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils

Files:

• AlignWayNodesAction.java (modified) (4 diffs)
• PasteRelationsAction.java (modified) (2 diffs)
• ReplaceGeometryAction.java (modified) (3 diffs)
• TagBufferAction.java (modified) (3 diffs)
• TagSourceAction.java (modified) (2 diffs)

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java

@@ -18 +18 @@
  */
 public class AlignWayNodesAction extends JosmAction {
-    private static final String TITLE = "Align Way Nodes";
+    private static final String TITLE = tr("Align Way Nodes");
     private static final double MOVE_THRESHOLD = 1e-9;
 
     public AlignWayNodesAction() {
-        super(tr(TITLE), "dumbutils/alignwaynodes", tr("Align nodes in a way"),
-                Shortcut.registerShortcut("tools:alignwaynodes", tr("Tool: {0}", tr(TITLE)), KeyEvent.VK_L, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
+        super(TITLE, "dumbutils/alignwaynodes", tr("Align nodes in a way"),
+                Shortcut.registerShortcut("tools:alignwaynodes", tr("Tool: {0}", TITLE), KeyEvent.VK_L, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
     }
 
@@ -35 +35 @@
         Way way = ways.iterator().next();
         if( way.getNodesCount() < (way.isClosed() ? 4 : 3) ) {
-            JOptionPane.showMessageDialog(Main.parent, tr("The way with selected nodes can not be straightened."), tr(TITLE), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Main.parent, tr("The way with selected nodes can not be straightened."), TITLE, JOptionPane.ERROR_MESSAGE);
             return;
         }
@@ -65 +65 @@
 
         if( nodes.size() < 3 ) {
-            JOptionPane.showMessageDialog(Main.parent, "Internal error: number of nodes is " + nodes.size(),
-                    tr(TITLE), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Main.parent, tr("Internal error: number of nodes is {0}.", nodes.size()),
+                    TITLE, JOptionPane.ERROR_MESSAGE);
             return;
         }
@@ -108 +108 @@
 
         if( !commands.isEmpty() )
-            Main.main.undoRedo.add(new SequenceCommand(tr(TITLE), commands));
+            Main.main.undoRedo.add(new SequenceCommand(TITLE, commands));
     }
 

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java

@@ -17 +17 @@
  */
 public class PasteRelationsAction extends JosmAction {
-    private static final String TITLE = "Paste Relations";
+    private static final String TITLE = tr("Paste Relations");
 
     public PasteRelationsAction() {
-        super(tr(TITLE), "dumbutils/pasterelations", tr("Paste relation membership from objects in the buffer onto selected object(s)"),
-                Shortcut.registerShortcut("tools:pasterelations", tr("Tool: {0}", tr(TITLE)), KeyEvent.VK_V,
+        super(TITLE, "dumbutils/pasterelations", tr("Paste relation membership from objects in the buffer onto selected object(s)"),
+                Shortcut.registerShortcut("tools:pasterelations", tr("Tool: {0}", TITLE), KeyEvent.VK_V,
                 Shortcut.GROUP_MENU, KeyEvent.ALT_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK), true);
     }
@@ -65 +65 @@
 
         if( !commands.isEmpty() )
-            Main.main.undoRedo.add(new SequenceCommand(tr(TITLE), commands));
+            Main.main.undoRedo.add(new SequenceCommand(TITLE, commands));
     }
 

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java

@@ -23 +23 @@
  */
 public class ReplaceGeometryAction extends JosmAction {
-    private static final String TITLE = "Replace Geometry";
+    private static final String TITLE = tr("Replace Geometry");
     private static final double MAX_NODE_REPLACEMENT_DISTANCE = 3e-4;
 
     public ReplaceGeometryAction() {
-        super(tr(TITLE), "dumbutils/replacegeometry", tr("Replace geometry of selected way with a new one"),
-                Shortcut.registerShortcut("tools:replacegeometry", tr("Tool: {0}", tr(TITLE)), KeyEvent.VK_G,
+        super(TITLE, "dumbutils/replacegeometry", tr("Replace geometry of selected way with a new one"),
+                Shortcut.registerShortcut("tools:replacegeometry", tr("Tool: {0}", TITLE), KeyEvent.VK_G,
                 Shortcut.GROUP_HOTKEY, Shortcut.SHIFT_DEFAULT), true);
     }
@@ -39 +39 @@
             JOptionPane.showMessageDialog(Main.parent,
                     tr("This tool replaces geometry of one way with another, and requires two ways to be selected."),
-                    tr(TITLE), JOptionPane.INFORMATION_MESSAGE);
+                    TITLE, JOptionPane.INFORMATION_MESSAGE);
             return;
         }
@@ -48 +48 @@
             JOptionPane.showMessageDialog(Main.parent,
                     tr("Please select one way that exists in the database and one new way with correct geometry."),
-                    tr(TITLE), JOptionPane.WARNING_MESSAGE);
+                    TITLE, JOptionPane.WARNING_MESSAGE);
             return;
         }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java

@@ -17 +17 @@
  */
 public class TagBufferAction extends JosmAction {
-    private static final String TITLE = "Copy tags from previous selection";
+    private static final String TITLE = tr("Copy tags from previous selection");
     private Map<String, String> tags = new HashMap<String, String>();
     private Map<String, String> currentTags = new HashMap<String, String>();
@@ -23 +23 @@
 
     public TagBufferAction() {
-        super(tr(TITLE), "dumbutils/tagbuffer", tr("Pastes tags of previously selected object(s)"),
-                Shortcut.registerShortcut("tools:tagbuffer", tr("Tool: {0}", tr(TITLE)), KeyEvent.VK_R,
+        super(TITLE, "dumbutils/tagbuffer", tr("Pastes tags of previously selected object(s)"),
+                Shortcut.registerShortcut("tools:tagbuffer", tr("Tool: {0}", TITLE), KeyEvent.VK_R,
                 Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
     }
@@ -48 +48 @@
         
         if( !commands.isEmpty() )
-            Main.main.undoRedo.add(new SequenceCommand(tr(TITLE), commands));
+            Main.main.undoRedo.add(new SequenceCommand(TITLE, commands));
     }
 

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagSourceAction.java

@@ -17 +17 @@
  */
 public class TagSourceAction extends JosmAction {
-    private static final String TITLE = "Add Source Tag";
+    private static final String TITLE = tr("Add Source Tag");
     private String source;
     private Set<OsmPrimitive> selectionBuf = new HashSet<OsmPrimitive>();
@@ -23 +23 @@
 
     public TagSourceAction() {
-        super(tr(TITLE), "dumbutils/sourcetag", tr("Add remembered source tag"),
-                Shortcut.registerShortcut("tools:sourcetag", tr("Tool: {0}", tr(TITLE)), KeyEvent.VK_S,
+        super(TITLE, "dumbutils/sourcetag", tr("Add remembered source tag"),
+                Shortcut.registerShortcut("tools:sourcetag", tr("Tool: {0}", TITLE), KeyEvent.VK_S,
                 Shortcut.GROUP_MENU, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK), true);
         source = Main.pref.get("sourcetag.value");