Changeset 25695 in osm


Ignore:
Timestamp:
2011-03-24T21:17:28+01:00 (14 years ago)
Author:
zverik
Message:

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

Location:
applications/editors/josm/plugins/relcontext
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/relcontext/TODO

    r25693 r25695  
    11- Solve width problem for narrows buttons when "fix" and "download" appear simultaneously
    2 - Check all strings to be properly formulated, search for similar ones in josm core and plugins
    32- Draw icons for multipoly settings menu
    43
  • applications/editors/josm/plugins/relcontext/src/relcontext/ChosenRelationComponent.java

    r25688 r25695  
    3333   
    3434    private final static String[] TYPE_KEYS = new String[] {
    35         "natural", "landuse", "place", "waterway", "leisure", "amenity", "restriction", "public_transport"
     35        "natural", "landuse", "place", "waterway", "leisure", "amenity", "restriction", "public_transport", "route", "enforcement"
    3636    };
    3737
    3838    private final static String[] NAMING_TAGS = new String[] {
    39         "name", "place_name", "ref", "note"
     39        "name", "place_name", "ref", "destination", "note"
    4040    };
    4141
  • applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java

    r25693 r25695  
    33import org.openstreetmap.josm.command.SequenceCommand;
    44import org.openstreetmap.josm.command.Command;
    5 import java.io.IOException;
    65import java.io.BufferedReader;
    76import java.io.InputStream;
    8 import java.io.Reader;
    97import java.io.InputStreamReader;
    108import java.awt.Point;
     
    4644import org.openstreetmap.josm.tools.Shortcut;
    4745import org.openstreetmap.josm.tools.GBC;
    48 import org.openstreetmap.josm.command.ChangeCommand;
    4946import org.openstreetmap.josm.command.ChangeRelationMemberRoleCommand;
    5047import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
  • applications/editors/josm/plugins/relcontext/src/relcontext/actions/ClearChosenRelationAction.java

    r25682 r25695  
    1717//        putValue(Action.NAME, "X");
    1818        putValue(Action.SMALL_ICON, ImageProvider.get("relcontext", "clear"));
    19         putValue(Action.SHORT_DESCRIPTION, tr("Clear chosen relation"));
     19        putValue(Action.SHORT_DESCRIPTION, tr("Clear the chosen relation"));
    2020        this.rel = rel;
    2121        rel.addChosenRelationListener(this);
  • applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateMultipolygonAction.java

    r25693 r25695  
    287287        panel.add(new JLabel(tr("Admin level")), GBC.std());
    288288        panel.add(Box.createHorizontalStrut(10), GBC.std());
    289         panel.add(admin, GBC.eol().fill(GBC.HORIZONTAL));
     289        panel.add(admin, GBC.eol().fill(GBC.HORIZONTAL).insets(0, 0, 0, 5));
    290290
    291291        final JTextField name = new JTextField();
     
    301301            }
    302302        };
    303         final JDialog dlg = optionPane.createDialog(Main.parent, tr("Create relation"));
     303        final JDialog dlg = optionPane.createDialog(Main.parent, tr("Create a new relation"));
    304304        dlg.setModalityType(ModalityType.DOCUMENT_MODAL);
    305305
  • applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateRelationAction.java

    r25692 r25695  
    3232 */
    3333public class CreateRelationAction extends JosmAction {
    34     private static final String ACTION_NAME = "Create relation";
    3534    private static final String PREF_LASTTYPE = "reltoolbox.createrelation.lasttype";
    3635    protected ChosenRelation chRel;
     
    8786    private String askForType() {
    8887        JPanel panel = new JPanel(new GridBagLayout());
    89         panel.add(new JLabel(tr("Choose type for the new relation:")), GBC.eol().insets(0, 0, 0, 5));
     88        panel.add(new JLabel(tr("Choose a type for the relation:")), GBC.eol().insets(0, 0, 0, 5));
    9089
    9190        final AutoCompletingComboBox keys = new AutoCompletingComboBox();
     
    105104            }
    106105        };
    107         final JDialog dlg = optionPane.createDialog(Main.parent, tr("Create relation"));
     106        final JDialog dlg = optionPane.createDialog(Main.parent, tr("Create a new relation"));
    108107        dlg.setModalityType(ModalityType.DOCUMENT_MODAL);
    109108
  • applications/editors/josm/plugins/relcontext/src/relcontext/actions/DeleteChosenRelationAction.java

    r25670 r25695  
    1515
    1616    public DeleteChosenRelationAction( ChosenRelation rel ) {
    17         super(tr("Delete relation"));
     17        super(tr("Delete the chosen relation"));
    1818        putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
    1919        this.rel = rel;
  • applications/editors/josm/plugins/relcontext/src/relcontext/actions/DownloadChosenRelationAction.java

    r25682 r25695  
    2929//        putValue(NAME, "D");
    3030        putValue(SMALL_ICON, ImageProvider.get("relcontext", "download"));
    31         putValue(SHORT_DESCRIPTION, tr("Download all incomplete members for chosen relation"));
     31        putValue(SHORT_DESCRIPTION, tr("Download incomplete members for the chosen relation"));
    3232        this.rel = rel;
    3333        rel.addChosenRelationListener(this);
  • applications/editors/josm/plugins/relcontext/src/relcontext/actions/DownloadParentsAction.java

    r25682 r25695  
    2929
    3030    public DownloadParentsAction( ChosenRelation rel ) {
    31         super(tr("Download all referrers"));
     31        super(tr("Download referrers"));
    3232        putValue(SMALL_ICON, ImageProvider.get("downloadreferrers"));
    33         putValue(SHORT_DESCRIPTION, tr("Download referrers for the relation and its members"));
     33        putValue(SHORT_DESCRIPTION, tr("Download referrers for the the chosen relation and its members"));
    3434        this.rel = rel;
    3535        rel.addChosenRelationListener(this);
  • applications/editors/josm/plugins/relcontext/src/relcontext/actions/EditChosenRelationAction.java

    r25682 r25695  
    2323//        putValue(NAME, "E");
    2424        putValue(SMALL_ICON, ImageProvider.get("dialogs/mappaint", "pencil"));
    25         putValue(SHORT_DESCRIPTION, tr("Open relation editor for chosen relation"));
     25        putValue(SHORT_DESCRIPTION, tr("Open relation editor for the chosen relation"));
    2626        this.rel = rel;
    2727        rel.addChosenRelationListener(this);
  • applications/editors/josm/plugins/relcontext/src/relcontext/actions/FindRelationAction.java

    r25682 r25695  
    4848            }
    4949        };
    50         final JDialog dlg = optionPane.createDialog(Main.parent, tr("Find relation"));
     50        final JDialog dlg = optionPane.createDialog(Main.parent, tr("Find a relation"));
    5151        dlg.setModalityType(ModalityType.DOCUMENT_MODAL);
    5252
  • applications/editors/josm/plugins/relcontext/src/relcontext/actions/RelationHelpAction.java

    r25680 r25695  
    2222    public RelationHelpAction( ChosenRelation rel ) {
    2323        super();
    24         putValue(NAME, tr("Relation wiki page"));
     24        putValue(NAME, tr("Open relation wiki page"));
    2525        putValue(SHORT_DESCRIPTION, tr("Launch browser with wiki help for selected object"));
    2626        putValue(SMALL_ICON, ImageProvider.get("dialogs", "search"));
     
    2828        rel.addChosenRelationListener(this);
    2929        setEnabled(false);
     30    }
     31
     32    public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
     33        setEnabled(newRelation != null);
    3034    }
    3135
     
    97101        }
    98102    }
    99 
    100     public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
    101         setEnabled(newRelation != null);
    102     }
    103103}
Note: See TracChangeset for help on using the changeset viewer.