Changeset 13591 in josm


Ignore:
Timestamp:
2018-03-31T19:41:26+02:00 (4 months ago)
Author:
Klumbumbus
Message:

fix #15939 - improve adding TMS/WMS/WMTS dialog texts, reduce translated strings by 4, add hint to check permission

Location:
trunk/src/org/openstreetmap/josm/gui/preferences/imagery
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java

    r11308 r13591  
    3636    public AddTMSLayerPanel() {
    3737
    38         add(new JLabel(tr("1. Enter URL")), GBC.eol());
     38        add(new JLabel(tr("{0} Make sure OSM has the permission to use this service", "1.")), GBC.eol());
     39        add(new JLabel(tr("{0} Enter URL", "2.")), GBC.eol());
    3940        add(new JLabel("<html>" + Utils.joinAsHtmlUnorderedList(Arrays.asList(
    4041                tr("{0} is replaced by tile zoom level, also supported:<br>" +
     
    5253        rawUrl.addKeyListener(keyAdapter);
    5354
    54         add(new JLabel(tr("2. Enter maximum zoom (optional)")), GBC.eol());
     55        add(new JLabel(tr("{0} Enter maximum zoom (optional)", "3.")), GBC.eol());
    5556        tmsZoom.addKeyListener(keyAdapter);
    5657        add(tmsZoom, GBC.eop().fill());
    5758
    58         add(new JLabel(tr("3. Verify generated TMS URL")), GBC.eol());
     59        add(new JLabel(tr("{0} Edit generated {1} URL (optional)", "4.", "TMS")), GBC.eol());
    5960        add(tmsUrl, GBC.eop().fill());
    6061        tmsUrl.setLineWrap(true);
    6162
    62         add(new JLabel(tr("4. Enter name for this layer")), GBC.eol());
     63        add(new JLabel(tr("{0} Enter name for this layer", "5.")), GBC.eol());
    6364        add(name, GBC.eop().fill());
    6465
  • trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java

    r13415 r13591  
    4646    public AddWMSLayerPanel() {
    4747
    48         add(new JLabel(tr("1. Enter service URL")), GBC.eol());
     48        add(new JLabel(tr("{0} Make sure OSM has the permission to use this service", "1.")), GBC.eol());
     49        add(new JLabel(tr("{0} Enter GetCapabilities URL", "2.")), GBC.eol());
    4950        add(rawUrl, GBC.eol().fill());
    5051        rawUrl.setLineWrap(true);
    51         JButton getLayers = new JButton(tr("Get layers"));
     52        JButton getLayers = new JButton(tr("{0} Get layers", "3."));
    5253        add(getLayers, GBC.eop().fill());
    5354
    54         add(new JLabel(tr("2. Select layers")), GBC.eol());
     55        add(new JLabel(tr("{0} Select layers", "4.")), GBC.eol());
    5556        add(endpoint, GBC.eol().fill());
    5657        add(new JScrollPane(tree.getLayerTree()), GBC.eol().fill().weight(1, 100));
     
    5960        add(showBounds, GBC.eop().fill());
    6061
    61         add(new JLabel(tr("3. Select image format")), GBC.eol());
     62        add(new JLabel(tr("{0} Select image format", "5.")), GBC.eol());
    6263        add(formats, GBC.eol().fill());
    6364
    64         wmsInstruction = new JLabel(tr("4. Verify generated WMS URL"));
     65        wmsInstruction = new JLabel(tr("{0} Edit generated {1} URL (optional)", "6.", "WMS"));
    6566        add(wmsInstruction, GBC.eol());
    6667        wmsInstruction.setLabelFor(wmsUrl);
     
    6869        wmsUrl.setLineWrap(true);
    6970
    70         add(new JLabel(tr("5. Enter name for this layer")), GBC.eol());
     71        add(new JLabel(tr("{0} Enter name for this layer", "7.")), GBC.eol());
    7172        add(name, GBC.eop().fill());
    7273
  • trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java

    r11289 r13591  
    2424     */
    2525    public AddWMTSLayerPanel() {
    26         add(new JLabel(tr("1. Enter getCapabilities URL")), GBC.eol());
     26        add(new JLabel(tr("{0} Make sure OSM has the permission to use this service", "1.")), GBC.eol());
     27        add(new JLabel(tr("{0} Enter GetCapabilities URL", "2.")), GBC.eol());
    2728        add(rawUrl, GBC.eop().fill());
    2829        rawUrl.setLineWrap(true);
    2930        rawUrl.setAlignmentY(TOP_ALIGNMENT);
    30         add(new JLabel(tr("2. Enter name for this layer")), GBC.eol());
     31        add(new JLabel(tr("{0} Enter name for this layer", "3.")), GBC.eol());
    3132        add(name, GBC.eol().fill(GBC.HORIZONTAL));
    3233        registerValidableComponent(rawUrl);
Note: See TracChangeset for help on using the changeset viewer.