Changeset 8872 in josm

Timestamp:

2015-10-14T22:44:32+02:00 (9 years ago)

Author:

simon04

Message:

fix #11696 - Option to prevent translation of values in presets

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (4 diffs)
• data/tagging-preset.xsd (modified) (1 diff)
• src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java (modified) (3 diffs)

trunk/data/defaultpresets.xml

@@ -120 +120 @@
     </chunk>
     <chunk id="oh">
-        <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00, Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+        <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00, Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" values_no_i18n="true" />
     </chunk>
     <chunk id="wheelchair">
@@ -4587 +4587 @@
             <text key="operator" text="Operator" />
             <text key="ref" text="Reference number" />
-            <combo key="collection_times" text="Collection times" delimiter="|" values="Mo-Sa 09:00|Mo-Fr 17:30; Sa 12:00|Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30" />
+            <combo key="collection_times" text="Collection times" delimiter="|" values="Mo-Sa 09:00|Mo-Fr 17:30; Sa 12:00|Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30" values_no_i18n="true" />
             <combo key="post_box:type" text="Type" values="pillar,lamp,wall,meter" values_context="post_box" />
             <check key="drive_through" text="Drive through" />
@@ -4770 +4770 @@
             <reference ref="fee" />
             <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Operation times" values="24/7" />
+            <combo key="opening_hours" text="Operation times" values="24/7" values_no_i18n="true" />
         </item> <!-- Sanitary Dump Station -->
         <separator/>
@@ -5707 +5707 @@
             <space />
             <key key="highway" value="street_lamp" />
-            <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" />
+            <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" values_no_i18n="true" />
         </item> <!-- Street Lamp -->
         <item name="Monitoring Station" icon="presets/monitoring_station.png" type="node,closedway" preset_name_label="true">

trunk/data/tagging-preset.xsd

@@ -204 +204 @@
                 <attribute name="values_from" type="string" />
                 <attribute name="values_context" type="string" />
+                <attribute name="values_no_i18n" type="boolean" />
                 <attribute name="display_values" type="string" />
                 <attribute name="values_searchable" type="boolean" />

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -97 +97 @@
     /** The context used for translating {@link #values} */
     public String values_context;
+    /** Disabled internationalisation for value to avoid mistakes, see #11696 */
+    public boolean values_no_i18n;
     public String display_values;
     /** The localized version of {@link #display_values}. */
@@ -387 +389 @@
         }
 
-        final String displ = Utils.firstNonNull(locale_display_values, display_values);
-        String[] display_array = displ == null ? value_array : splitEscaped(delChar, displ);
+        String[] display_array = value_array;
+        if (!values_no_i18n) {
+            final String displ = Utils.firstNonNull(locale_display_values, display_values);
+            display_array = displ == null ? value_array : splitEscaped(delChar, displ);
+        }
 
         final String descr = Utils.firstNonNull(locale_short_descriptions, short_descriptions);
@@ -408 +413 @@
         for (int i = 0; i < value_array.length; i++) {
             final PresetListEntry e = new PresetListEntry(value_array[i]);
-            e.locale_display_value = locale_display_values != null
+            e.locale_display_value = locale_display_values != null || values_no_i18n
                     ? display_array[i]
                     : trc(values_context, fixPresetString(display_array[i]));