Changeset 12943 in josm for trunk

Timestamp:

2017-10-08T13:42:54+02:00 (7 years ago)

Author:

bastiK

Message:

see #15410 - do not attempt to translate preference key

Location:

trunk

Files:

• netbeans/nbproject/genfiles.properties (modified) (1 diff)
• src/org/openstreetmap/josm/data/Preferences.java (modified) (1 diff)

trunk/netbeans/nbproject/genfiles.properties

@@ -5 +5 @@
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=f36994fb
-nbproject/build-impl.xml.script.CRC32=05416174
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
+nbproject/build-impl.xml.script.CRC32=5e13918b
+nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -987 +987 @@
         }
         String fullKey = COLOR_PREFIX + o;
-        return tr(I18n.escape(colornames.containsKey(fullKey) ? colornames.get(fullKey) : fullKey));
+        return colornames.containsKey(fullKey) ? tr(I18n.escape(colornames.get(fullKey))) : fullKey;
     }