Changeset 25695 in osm

Timestamp:

2011-03-24T21:17:28+01:00 (13 years ago)

Author:

zverik

Message:

fix all strings for translation, update relation types (relcontext plugin)

Location:

applications/editors/josm/plugins/relcontext

Files:

• TODO (modified) (1 diff)
• src/relcontext/ChosenRelationComponent.java (modified) (1 diff)
• src/relcontext/RelContextDialog.java (modified) (2 diffs)
• src/relcontext/actions/ClearChosenRelationAction.java (modified) (1 diff)
• src/relcontext/actions/CreateMultipolygonAction.java (modified) (2 diffs)
• src/relcontext/actions/CreateRelationAction.java (modified) (3 diffs)
• src/relcontext/actions/DeleteChosenRelationAction.java (modified) (1 diff)
• src/relcontext/actions/DownloadChosenRelationAction.java (modified) (1 diff)
• src/relcontext/actions/DownloadParentsAction.java (modified) (1 diff)
• src/relcontext/actions/EditChosenRelationAction.java (modified) (1 diff)
• src/relcontext/actions/FindRelationAction.java (modified) (1 diff)
• src/relcontext/actions/RelationHelpAction.java (modified) (3 diffs)

applications/editors/josm/plugins/relcontext/TODO

@@ -1 +1 @@
 - Solve width problem for narrows buttons when "fix" and "download" appear simultaneously
-- Check all strings to be properly formulated, search for similar ones in josm core and plugins
 - Draw icons for multipoly settings menu
 

applications/editors/josm/plugins/relcontext/src/relcontext/ChosenRelationComponent.java

@@ -33 +33 @@
     
     private final static String[] TYPE_KEYS = new String[] {
-        "natural", "landuse", "place", "waterway", "leisure", "amenity", "restriction", "public_transport"
+        "natural", "landuse", "place", "waterway", "leisure", "amenity", "restriction", "public_transport", "route", "enforcement"
     };
 
     private final static String[] NAMING_TAGS = new String[] {
-        "name", "place_name", "ref", "note"
+        "name", "place_name", "ref", "destination", "note"
     };
 

applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java

@@ -3 +3 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.command.Command;
-import java.io.IOException;
 import java.io.BufferedReader;
 import java.io.InputStream;
-import java.io.Reader;
 import java.io.InputStreamReader;
 import java.awt.Point;
@@ -46 +44 @@
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.ChangeRelationMemberRoleCommand;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;

applications/editors/josm/plugins/relcontext/src/relcontext/actions/ClearChosenRelationAction.java

@@ -17 +17 @@
 //        putValue(Action.NAME, "X");
         putValue(Action.SMALL_ICON, ImageProvider.get("relcontext", "clear"));
-        putValue(Action.SHORT_DESCRIPTION, tr("Clear chosen relation"));
+        putValue(Action.SHORT_DESCRIPTION, tr("Clear the chosen relation"));
         this.rel = rel;
         rel.addChosenRelationListener(this);

applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateMultipolygonAction.java

@@ -287 +287 @@
         panel.add(new JLabel(tr("Admin level")), GBC.std());
         panel.add(Box.createHorizontalStrut(10), GBC.std());
-        panel.add(admin, GBC.eol().fill(GBC.HORIZONTAL));
+        panel.add(admin, GBC.eol().fill(GBC.HORIZONTAL).insets(0, 0, 0, 5));
 
         final JTextField name = new JTextField();
@@ -301 +301 @@
             }
         };
-        final JDialog dlg = optionPane.createDialog(Main.parent, tr("Create relation"));
+        final JDialog dlg = optionPane.createDialog(Main.parent, tr("Create a new relation"));
         dlg.setModalityType(ModalityType.DOCUMENT_MODAL);
 

applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateRelationAction.java

@@ -32 +32 @@
  */
 public class CreateRelationAction extends JosmAction {
-    private static final String ACTION_NAME = "Create relation";
     private static final String PREF_LASTTYPE = "reltoolbox.createrelation.lasttype";
     protected ChosenRelation chRel;
@@ -87 +86 @@
     private String askForType() {
         JPanel panel = new JPanel(new GridBagLayout());
-        panel.add(new JLabel(tr("Choose type for the new relation:")), GBC.eol().insets(0, 0, 0, 5));
+        panel.add(new JLabel(tr("Choose a type for the relation:")), GBC.eol().insets(0, 0, 0, 5));
 
         final AutoCompletingComboBox keys = new AutoCompletingComboBox();
@@ -105 +104 @@
             }
         };
-        final JDialog dlg = optionPane.createDialog(Main.parent, tr("Create relation"));
+        final JDialog dlg = optionPane.createDialog(Main.parent, tr("Create a new relation"));
         dlg.setModalityType(ModalityType.DOCUMENT_MODAL);
 

applications/editors/josm/plugins/relcontext/src/relcontext/actions/DeleteChosenRelationAction.java

@@ -15 +15 @@
 
     public DeleteChosenRelationAction( ChosenRelation rel ) {
-        super(tr("Delete relation"));
+        super(tr("Delete the chosen relation"));
         putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
         this.rel = rel;

applications/editors/josm/plugins/relcontext/src/relcontext/actions/DownloadChosenRelationAction.java

@@ -29 +29 @@
 //        putValue(NAME, "D");
         putValue(SMALL_ICON, ImageProvider.get("relcontext", "download"));
-        putValue(SHORT_DESCRIPTION, tr("Download all incomplete members for chosen relation"));
+        putValue(SHORT_DESCRIPTION, tr("Download incomplete members for the chosen relation"));
         this.rel = rel;
         rel.addChosenRelationListener(this);

applications/editors/josm/plugins/relcontext/src/relcontext/actions/DownloadParentsAction.java

@@ -29 +29 @@
 
     public DownloadParentsAction( ChosenRelation rel ) {
-        super(tr("Download all referrers"));
+        super(tr("Download referrers"));
         putValue(SMALL_ICON, ImageProvider.get("downloadreferrers"));
-        putValue(SHORT_DESCRIPTION, tr("Download referrers for the relation and its members"));
+        putValue(SHORT_DESCRIPTION, tr("Download referrers for the the chosen relation and its members"));
         this.rel = rel;
         rel.addChosenRelationListener(this);

applications/editors/josm/plugins/relcontext/src/relcontext/actions/EditChosenRelationAction.java

@@ -23 +23 @@
 //        putValue(NAME, "E");
         putValue(SMALL_ICON, ImageProvider.get("dialogs/mappaint", "pencil"));
-        putValue(SHORT_DESCRIPTION, tr("Open relation editor for chosen relation"));
+        putValue(SHORT_DESCRIPTION, tr("Open relation editor for the chosen relation"));
         this.rel = rel;
         rel.addChosenRelationListener(this);

applications/editors/josm/plugins/relcontext/src/relcontext/actions/FindRelationAction.java

@@ -48 +48 @@
             }
         };
-        final JDialog dlg = optionPane.createDialog(Main.parent, tr("Find relation"));
+        final JDialog dlg = optionPane.createDialog(Main.parent, tr("Find a relation"));
         dlg.setModalityType(ModalityType.DOCUMENT_MODAL);
 

applications/editors/josm/plugins/relcontext/src/relcontext/actions/RelationHelpAction.java

@@ -22 +22 @@
     public RelationHelpAction( ChosenRelation rel ) {
         super();
-        putValue(NAME, tr("Relation wiki page"));
+        putValue(NAME, tr("Open relation wiki page"));
         putValue(SHORT_DESCRIPTION, tr("Launch browser with wiki help for selected object"));
         putValue(SMALL_ICON, ImageProvider.get("dialogs", "search"));
@@ -28 +28 @@
         rel.addChosenRelationListener(this);
         setEnabled(false);
+    }
+
+    public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+        setEnabled(newRelation != null);
     }
 
@@ -97 +101 @@
         }
     }
-
-    public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
-        setEnabled(newRelation != null);
-    }
 }