Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java (revision 14184) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java (revision 14185) @@ -112,9 +112,9 @@ c.setFont(c.getFont().deriveFont(Font.ITALIC)); - } else { // One value: display the value - final Map.Entry entry = v.entrySet().iterator().next(); - str = (String) entry.getKey(); + } else { // One value: display the value + str = (String) v.entrySet().iterator().next().getKey(); } } + boolean knownNameKey = false; if (column == 0 && str != null) { Matcher m = LANGUAGE_NAMES.matcher(str); @@ -122,10 +122,12 @@ String code = m.group(1); String label = new Locale(code).getDisplayLanguage(); - if (!code.equals(label)) { - str = new StringBuilder(str).append(" <").append(label).append('>').toString(); + knownNameKey = !code.equals(label); + if (knownNameKey) { + str = new StringBuilder("").append(str) + .append(" <").append(label).append(">").toString(); } } } - ((JLabel) c).putClientProperty("html.disable", Boolean.TRUE); // Fix #8730 + ((JLabel) c).putClientProperty("html.disable", knownNameKey ? null : Boolean.TRUE); // Fix #8730 ((JLabel) c).setText(str); if (DISCARDABLE.get()) {