Changeset 29434 in osm for applications/editors

Timestamp:

2013-03-29T21:30:25+01:00 (12 years ago)

Author:

zverik

Message:

fixed composite translation strings

Location:

applications/editors/josm/plugins/imagery_offset_db/src/iodb

Files:

• CalibrationLayer.java (modified) (2 diffs)
• DeprecateOffsetAction.java (modified) (2 diffs)
• OffsetInfoAction.java (modified) (2 diffs)

applications/editors/josm/plugins/imagery_offset_db/src/iodb/CalibrationLayer.java

@@ -100 +100 @@
     public String getToolTipText() {
         if( obj.isDeprecated() )
-            return tr("A deprecated calibration of type {0} by {1}", OffsetInfoAction.getGeometryType(obj), obj.getAuthor());
+            return tr("A deprecated calibration geometry of {0} nodes by {1}", obj.getGeometry().length, obj.getAuthor());
         else
-            return tr("A calibration of type {0} by {1}", OffsetInfoAction.getGeometryType(obj), obj.getAuthor());
+            return tr("A calibration geometry of {0} nodes by {1}", obj.getGeometry().length, obj.getAuthor());
     }
 
@@ -198 +198 @@
     class ZoomToLayerAction extends AbstractAction {
         public ZoomToLayerAction() {
-            super(tr("Zoom to layer"));
+            super(tr("Zoom to {0}", tr("layer"))); // to use translation from AutoScaleAction
             putValue(SMALL_ICON, ImageProvider.get("dialogs/autoscale/layer"));
         }

applications/editors/josm/plugins/imagery_offset_db/src/iodb/DeprecateOffsetAction.java

@@ -45 +45 @@
                 tr("Are you sure this calibration geometry is aligned badly?");
         if( JOptionPane.showConfirmDialog(Main.parent,
-                tr("Warning: deprecation is basically irreversible!\n{0}", desc),
+                tr("Warning: deprecation is basically irreversible!")+ "\n" + desc,
                 ImageryOffsetTools.DIALOG_TITLE, JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) != JOptionPane.YES_OPTION ) {
             return;
@@ -78 +78 @@
         }
 
-        String message;
-        if(offset instanceof ImageryOffset)
-            message = tr("Please enter the reason why you mark this imagery offset as deprecated");
-        else
-            message = tr("Please enter the reason why you mark this calibration geometry as deprecated");
-        String reason = StoreImageryOffsetAction.queryDescription(message);
+        String message = offset instanceof ImageryOffset
+                ? tr("Please enter the reason why you mark this imagery offset as deprecated")
+                : tr("Please enter the reason why you mark this calibration geometry as deprecated");
+        String reason = StoreImageryOffsetAction.queryDescription(message + ":");
         if( reason == null )
             return;

applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetInfoAction.java

@@ -76 +76 @@
             sb.append(tr("Imagery ID")).append(": ").append(((ImageryOffset)offset).getImagery()).append('\n');
         } else {
-            sb.append(tr("A calibration of type {0}", getGeometryType((CalibrationObject)offset))).append('\n');
+            sb.append(tr("A calibration geometry of {0} nodes", ((CalibrationObject)offset).getGeometry().length)).append('\n');
         }
         
@@ -101 +101 @@
         return sb.toString();
     }
-
-    /**
-     * Explains a calibration object geometry type: whether is's a point,
-     * a path or a polygon.
-     */
-    public static String getGeometryType( CalibrationObject obj ) {
-        if( obj.getGeometry() == null )
-            return tr("nothing"); // meant never to happen
-        int n = obj.getGeometry().length;
-        if( n == 1 )
-            return tr("point");
-        else if( n > 1 && !obj.getGeometry()[0].equals(obj.getGeometry()[n - 1]) )
-            return tr("path ({0} nodes)", n);
-        else if( n > 1 && obj.getGeometry()[0].equals(obj.getGeometry()[n - 1]) )
-            return tr("polygon ({0} nodes)", n - 1);
-        else
-            return tr("geometry"); // meant never to happen
-    }
 }