Changeset 12942 in josm for trunk/src

Timestamp:

2017-10-08T13:39:18+02:00 (7 years ago)

Author:

bastiK

Message:

see #15410 - better fix for color name display

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• gui/preferences/display/ColorPreference.java (modified) (1 diff)

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

@@ -986 +986 @@
             return tr("Layer: {0}", tr(I18n.escape(m.group(1))));
         }
-        return tr(I18n.escape(colornames.containsKey(o) ? colornames.get(o) : o));
+        String fullKey = COLOR_PREFIX + o;
+        return tr(I18n.escape(colornames.containsKey(fullKey) ? colornames.get(fullKey) : fullKey));
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -145 +145 @@
 
     private static String getName(String o) {
-        return Main.pref.getColorName("color." + o);
+        return Main.pref.getColorName(o);
     }