Changeset 12943 in josm


Ignore:
Timestamp:
2017-10-08T13:42:54+02:00 (2 weeks ago)
Author:
bastiK
Message:

see #15410 - do not attempt to translate preference key

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/netbeans/nbproject/genfiles.properties

    r9765 r12943  
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    66nbproject/build-impl.xml.data.CRC32=f36994fb
    7 nbproject/build-impl.xml.script.CRC32=05416174
    8 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
     7nbproject/build-impl.xml.script.CRC32=5e13918b
     8nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
  • trunk/src/org/openstreetmap/josm/data/Preferences.java

    r12942 r12943  
    987987        }
    988988        String fullKey = COLOR_PREFIX + o;
    989         return tr(I18n.escape(colornames.containsKey(fullKey) ? colornames.get(fullKey) : fullKey));
     989        return colornames.containsKey(fullKey) ? tr(I18n.escape(colornames.get(fullKey))) : fullKey;
    990990    }
    991991
Note: See TracChangeset for help on using the changeset viewer.