Changeset 8872 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

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

Author:

simon04

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java (modified) (3 diffs)

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]));