Changeset 865 in josm for trunk

Timestamp:

2008-08-24T23:06:24+02:00 (16 years ago)

Author:

stoecker

Message:

I18N fixes for Lambert projection patch

File:

• trunk/src/org/openstreetmap/josm/data/projection/Lambert.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/projection/Lambert.java

@@ -106 +106 @@
                         if (p.lat() != 0 && Math.abs(p.lat()) != Projection.MAX_LAT
                                         && p.lon() != 0 && Math.abs(p.lon()) != Projection.MAX_LON
-                                && dontDisplayErrors == false) {
-                                JOptionPane.showMessageDialog(Main.parent, 
-                                                tr("The projection \"" + this.toString() + "\" is designed for\n" 
-                                        + "latitudes between 46.1 and 57 degrees only.\n"
-                                        + "Use another projection system if you are not using\n"
-                                        + "a french WMS server.\n"
-                                        + "Do not upload any data after this message."));
+                                        && dontDisplayErrors == false) {
+                                JOptionPane.showMessageDialog(Main.parent,
+                                                tr("The projection \"{0}\" is designed for\n"
+                                                + "latitudes between 46.1° and 57° only.\n"
+                                                + "Use another projection system if you are not using\n"
+                                                + "a french WMS server.\n"
+                                                + "Do not upload any data after this message.", this.toString()));
                                 dontDisplayErrors = true;
                         }
@@ -126 +126 @@
                                                                         tr("IMPORTANT : data positionned far away from\n"
                                                                                         + "the current Lambert zone limits.\n"
-                                                                                + "Do not upload any data after this message.\n"
+                                                                                        + "Do not upload any data after this message.\n"
                                                                                         + "Undo your last action, Save your work \n"
                                                                                         + "and Start a new layer on the new zone."));
@@ -132 +132 @@
                                         dontDisplayErrors = true;
                                 } else {
-                                        System.out.println("temporarily extends Lambert zone " + layoutZone + " projection at lat,lon:"
-                                                + lt + "," + lg);
+                                        System.out.println("temporarily extend Lambert zone " + layoutZone + " projection at lat,lon:"
+                                                        + lt + "," + lg);
                                 }
                         }
@@ -156 +156 @@
 
         @Override public String toString() {
-                return "Lambert Zone (France)";
+                return tr("Lambert Zone (France)");
         }
 
@@ -293 +293 @@
                         s2 *= s2;
                         double l = Math.atan((Z / norm)
-                                        / (1.0 - (ell.a * ell.e2 * Math.cos(lt) / (norm * Math.sqrt(1.0 - ell.e2 * s2)))));
+                                / (1.0 - (ell.a * ell.e2 * Math.cos(lt) / (norm * Math.sqrt(1.0 - ell.e2 * s2)))));
                         delta = Math.abs(l - lt);
                         lt = l;