Changeset 6671 in josm for trunk/src/org
- Timestamp:
- 2014-01-11T20:25:43+01:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/Preferences.java
r6670 r6671 53 53 import org.openstreetmap.josm.tools.CheckParameterUtil; 54 54 import org.openstreetmap.josm.tools.ColorHelper; 55 import org.openstreetmap.josm.tools.I18n; 55 56 import org.openstreetmap.josm.tools.Utils; 56 57 … … 836 837 Matcher m = Pattern.compile("mappaint\\.(.+?)\\.(.+)").matcher(o); 837 838 if (m.matches()) { 838 return tr("Paint style {0}: {1}", tr( m.group(1)), tr(m.group(2)));839 return tr("Paint style {0}: {1}", tr(I18n.escape(m.group(1))), tr(I18n.escape(m.group(2)))); 839 840 } 840 841 } catch (Exception e) { … … 844 845 Matcher m = Pattern.compile("layer (.+)").matcher(o); 845 846 if (m.matches()) { 846 return tr("Layer: {0}", tr( m.group(1)));847 return tr("Layer: {0}", tr(I18n.escape(m.group(1)))); 847 848 } 848 849 } catch (Exception e) { 849 850 Main.warn(e); 850 851 } 851 return tr( colornames.containsKey(o) ? colornames.get(o) : o);852 return tr(I18n.escape(colornames.containsKey(o) ? colornames.get(o) : o)); 852 853 } 853 854
Note:
See TracChangeset
for help on using the changeset viewer.