Changeset 786 in josm

Timestamp:

Aug 15, 2008 9:32:41 PM (5 years ago)

Author:

stoecker

Message:

I18N

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/MapPaintVisitor.java (modified) (2 diffs)
• data/osm/visitor/SimplePaintVisitor.java (modified) (2 diffs)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.data.osm.visitor;
+
+import static org.openstreetmap.josm.tools.I18n.marktr;
 
 import java.awt.BasicStroke;
@@ -368 +370 @@
     // Shows areas before non-areas
     public void visitAll(DataSet data) {
-        inactiveColor = Preferences.getPreferencesColor("inactive", Color.DARK_GRAY);
-        selectedColor = Preferences.getPreferencesColor("selected", Color.YELLOW);
-        nodeColor = Preferences.getPreferencesColor("node", Color.RED);
-        dfltWayColor = Preferences.getPreferencesColor("way", darkblue);
-        incompleteColor = Preferences.getPreferencesColor("incomplete way", darkerblue);
-        backgroundColor = Preferences.getPreferencesColor("background", Color.BLACK);
-        untaggedColor = Preferences.getPreferencesColor("untagged",Color.GRAY);
-        textColor = Preferences.getPreferencesColor ("text", Color.WHITE);
+        inactiveColor = Preferences.getPreferencesColor(marktr("inactive"), Color.DARK_GRAY);
+        selectedColor = Preferences.getPreferencesColor(marktr("selected"), Color.YELLOW);
+        nodeColor = Preferences.getPreferencesColor(marktr("node"), Color.RED);
+        dfltWayColor = Preferences.getPreferencesColor(marktr("way"), darkblue);
+        incompleteColor = Preferences.getPreferencesColor(marktr("incomplete way"), darkerblue);
+        backgroundColor = Preferences.getPreferencesColor(marktr("background"), Color.BLACK);
+        untaggedColor = Preferences.getPreferencesColor(marktr("untagged"),Color.GRAY);
+        textColor = Preferences.getPreferencesColor (marktr("text"), Color.WHITE);
         showDirectionArrow = Main.pref.getBoolean("draw.segment.direction");
         showRelevantDirectionsOnly = Main.pref.getBoolean("draw.segment.relevant_directions_only");

trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.data.osm.visitor;
+
+import static org.openstreetmap.josm.tools.I18n.marktr;
 
 import java.awt.BasicStroke;
@@ -90 +92 @@
 
         public void visitAll(DataSet data) {
-                inactiveColor = Preferences.getPreferencesColor("inactive", Color.DARK_GRAY);
-                selectedColor = Preferences.getPreferencesColor("selected", Color.WHITE);
-                nodeColor = Preferences.getPreferencesColor("node", Color.RED);
-                dfltWayColor = Preferences.getPreferencesColor("way", darkblue);
-                relationColor = Preferences.getPreferencesColor("relation", teal);
-                untaggedWayColor = Preferences.getPreferencesColor("untagged way", darkgreen);
-                incompleteColor = Preferences.getPreferencesColor("incomplete way", darkerblue);
-                backgroundColor = Preferences.getPreferencesColor("background", Color.BLACK);
+                inactiveColor = Preferences.getPreferencesColor(marktr("inactive"), Color.DARK_GRAY);
+                selectedColor = Preferences.getPreferencesColor(marktr("selected"), Color.WHITE);
+                nodeColor = Preferences.getPreferencesColor(marktr("node"), Color.RED);
+                dfltWayColor = Preferences.getPreferencesColor(marktr("way"), darkblue);
+                relationColor = Preferences.getPreferencesColor(marktr("relation"), teal);
+                untaggedWayColor = Preferences.getPreferencesColor(marktr("untagged way"), darkgreen);
+                incompleteColor = Preferences.getPreferencesColor(marktr("incomplete way"), darkerblue);
+                backgroundColor = Preferences.getPreferencesColor(marktr("background"), Color.BLACK);
                 showDirectionArrow = Main.pref.getBoolean("draw.segment.direction");
                 showRelevantDirectionsOnly = Main.pref.getBoolean("draw.segment.relevant_directions_only");

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -3 +3 @@
 package org.openstreetmap.josm.gui.layer;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
@@ -156 +157 @@
                                         Point p1 = mv.getPoint(en1);
                                         Point p2 = mv.getPoint(en2);
-                                        Color color = inactive ? Preferences.getPreferencesColor("inactive", Color.DARK_GRAY) :
-                                                        Preferences.getPreferencesColor("downloaded Area", Color.YELLOW);
+                                        Color color = inactive ? Preferences.getPreferencesColor(marktr("inactive"), Color.DARK_GRAY) :
+                                                        Preferences.getPreferencesColor(marktr("downloaded Area"), Color.YELLOW);
                                         g.setColor(color);
                                         g.drawRect(Math.min(p1.x,p2.x), Math.min(p1.y, p2.y), Math.abs(p2.x-p1.x), Math.abs(p2.y-p1.y));