Changeset 3727 in josm for trunk

Timestamp:

2010-12-15T22:13:15+01:00 (14 years ago)

Author:

bastiK

Message:

shorten display_values a bit to get rid of <br>

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -506 +506 @@
             <optional>
                 <text key="name" text="Name" default="" delete_if_empty="true" />
-                <combo key="sac_scale" text="SAC Scale" values="hiking,mountain_hiking,demanding_mountain_hiking,alpine_hiking,demanding_alpine_hiking,difficult_alpine_hiking" default="" delete_if_empty="true" display_values="T1 - hiking trail,T2 - mountain hiking trail,T3 - difficult,T4 - difficult\, exposed\, steep alpine trail,T5 - difficult\, exposed\, steep alpine trail&lt;br&gt;with climbing,T6 - difficult\, hazardous alpine trail with&lt;br&gt;climbing">
+                <combo key="sac_scale" text="SAC Scale" values="hiking,mountain_hiking,demanding_mountain_hiking,alpine_hiking,demanding_alpine_hiking,difficult_alpine_hiking" default="" delete_if_empty="true" display_values="T1 - hiking trail,T2 - mountain hiking trail,T3 - difficult,T4 - difficult\, exposed\, steep alpine trail,T5 - difficult alpine trail with climbing,T6 - hazardous alpine trail with climbing">
                     <short_description>Trail well cleared. Area flat or slightly sloped, no fall hazard</short_description>
                     <short_description>Trail with continuous line and balanced ascent. Terrain partially steep, fall hazard possible</short_description>

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -394 +394 @@
 
             if (display_array.length != value_array.length) {
-                System.err.println(tr("Broken tagging preset \"{0}-{1}\" - number of items in display_values must be the same as in values", key, text));
+                System.err.println(tr("Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' must be the same as in ''values''", key, text));
                 display_array = value_array;
             }
 
             if (short_descriptions_array != null && short_descriptions_array.length != value_array.length) {
-                System.err.println(tr("Broken tagging preset \"{0}-{1}\" - number of items in short_descriptions must be the same as in values", key, text));
+                System.err.println(tr("Broken tagging preset \"{0}-{1}\" - number of items in ''short_descriptions'' must be the same as in ''values''", key, text));
                 short_descriptions_array = null;
             }