Changeset 2181 in josm for trunk/src/org/openstreetmap/josm/io/OsmReader.java

Timestamp:

2009-09-22T15:34:19+02:00 (15 years ago)

Author:

stoecker

Message:

lots of i18n fixes

File:

• trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) (16 diffs)

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -172 +172 @@
             if (qName.equals("osm")) {
                 if (atts == null) {
-                    throwException(tr("Missing mandatory attribute ''{0}'' of XML element {1}", "version", "osm"));
+                    throwException(tr("Missing mandatory attribute ''{0}'' of XML element {1}.", "version", "osm"));
                 }
                 String v = atts.getValue("version");
                 if (v == null) {
-                    throwException(tr("Missing mandatory attribute ''{0}''", "version"));
+                    throwException(tr("Missing mandatory attribute ''{0}''.", "version"));
                 }
                 if (!(v.equals("0.5") || v.equals("0.6"))) {
@@ -203 +203 @@
                 } else {
                     throwException(tr(
-                            "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''",
+                            "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''.",
                             minlon, minlat, maxlon, maxlat, origin
                     ));
@@ -226 +226 @@
                 if (list == null) {
                     throwException(
-                            tr("found XML element <nd> element not as direct child of element <way>")
+                            tr("Found XML element <nd> not as direct child of element <way>.")
                     );
                 }
                 if (atts.getValue("ref") == null) {
                     throwException(
-                            tr("Missing mandatory attribute ''{0}'' on <nd> of way {1}", "ref", current.id)
+                            tr("Missing mandatory attribute ''{0}'' on <nd> of way {1}.", "ref", current.id)
                     );
                 }
@@ -237 +237 @@
                 if (id == 0) {
                     throwException(
-                            tr("Illegal value of attribute ''ref'' of element <nd>. Got {0}", id)
+                            tr("Illegal value of attribute ''ref'' of element <nd>. Got {0}.", id)
                     );
                 }
@@ -254 +254 @@
                 if (list == null) {
                     throwException(
-                            tr("Found XML element <member> not as direct child of element <relation>")
+                            tr("Found XML element <member> not as direct child of element <relation>.")
                     );
                 }
@@ -260 +260 @@
                 String value = atts.getValue("ref");
                 if (value == null) {
-                    throwException(tr("Missing attribute ''ref'' on member in relation {0}",current.id));
+                    throwException(tr("Missing attribute ''ref'' on member in relation {0}.",current.id));
                 }
                 try {
@@ -269 +269 @@
                 value = atts.getValue("type");
                 if (value == null) {
-                    throwException(tr("Missing attribute ''type'' on member {0} in relation {1}", Long.toString(emd.id), Long.toString(current.id)));
+                    throwException(tr("Missing attribute ''type'' on member {0} in relation {1}.", Long.toString(emd.id), Long.toString(current.id)));
                 }
                 if (! (value.equals("way") || value.equals("node") || value.equals("relation"))) {
@@ -309 +309 @@
                 return User.createOsmUser(id, name);
             } catch(NumberFormatException e) {
-                throwException(tr("Illegal value for attribute ''uid''. Got ''{0}''", uid));
+                throwException(tr("Illegal value for attribute ''uid''. Got ''{0}''.", uid));
             }
             return null;
@@ -319 +319 @@
             current.id = getLong(atts, "id");
             if (current.id == 0) {
-                throwException(tr("Illegal object with id=0"));
+                throwException(tr("Illegal object with ID=0."));
             }
 
@@ -345 +345 @@
                     current.version = Integer.parseInt(version);
                 } catch(NumberFormatException e) {
-                    throwException(tr("Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}", Long.toString(current.id), version));
+                    throwException(tr("Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got {1}.", Long.toString(current.id), version));
                 }
                 if (ds.version.equals("0.6")){
                     if (current.version <= 0 && current.id > 0) {
-                        throwException(tr("Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}", Long.toString(current.id), version));
+                        throwException(tr("Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got {1}.", Long.toString(current.id), version));
                     } else if (current.version < 0 && current.id  <=0) {
-                        System.out.println(tr("WARNING: normalizing value of attribute ''version'' of element {0} to 0, API version is ''0.6''. Got {1}", current.id, current.version));
+                        System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.id, current.version, 0, "0.6"));
                         current.version = 0;
                     }
                 } else if (ds.version.equals("0.5")) {
                     if (current.version <= 0 && current.id > 0) {
-                        System.out.println(tr("WARNING: normalizing value of attribute ''version'' of element {0} to 1, API version is ''0.5''. Got {1}", current.id, current.version));
+                        System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.id, current.version, 1, "0.5"));
                         current.version = 1;
                     } else if (current.version < 0 && current.id  <=0) {
-                        System.out.println(tr("WARNING: normalizing value of attribute ''version'' of element {0} to 0, API version is ''0.5''. Got {1}", current.id, current.version));
+                        System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.id, current.version, 0, "0.5"));
                         current.version = 0;
                     }
                 } else {
                     // should not happen. API version has been checked before
-                    throwException(tr("Unknown or unsupported API version. Got {0}", ds.version));
+                    throwException(tr("Unknown or unsupported API version. Got {0}.", ds.version));
                 }
             } else {
@@ -370 +370 @@
                 //
                 if (current.id > 0 && ds.version != null && ds.version.equals("0.6")) {
-                    throwException(tr("Missing attribute ''version'' on OSM primitive with id {0}", Long.toString(current.id)));
+                    throwException(tr("Missing attribute ''version'' on OSM primitive with ID {0}.", Long.toString(current.id)));
                 }
             }
@@ -392 +392 @@
                 return Long.parseLong(value);
             } catch(NumberFormatException e) {
-                throwException(tr("Illegal long value for attribute ''{0}''. Got ''{1}''",name, value));
+                throwException(tr("Illegal long value for attribute ''{0}''. Got ''{1}''.",name, value));
             }
             return 0; // should not happen
@@ -416 +416 @@
                         throw new IllegalDataException (
                                 tr(
-                                        "way with external id ''{0}'' includes missing node with external id ''{1}''",
+                                        "Way with external ID ''{0}'' includes missing node with external ID ''{1}''.",
                                         externalWayId,
                                         id
@@ -429 +429 @@
             w.setNodes(wayNodes);
             if (incomplete) {
-                logger.warning(tr("marked way {0} with {1} nodes incomplete because at least one node was missing in the " +
-                        "loaded data and is therefore incomplete too", externalWayId, w.getNodesCount()));
+                logger.warning(tr("Marked way {0} with {1} nodes incomplete because at least one node was missing in the " +
+                        "loaded data and is therefore incomplete too.", externalWayId, w.getNodesCount()));
                 w.incomplete = true;
                 ds.addPrimitive(w);
@@ -477 +477 @@
                 } else
                     throw new IllegalDataException(
-                            tr("Unknown relation member type ''{0}'' in relation with external id ''{1}''", rm.type,externalRelationId)
+                            tr("Unknown relation member type ''{0}'' in relation with external id ''{1}''.", rm.type,externalRelationId)
                     );
 
@@ -488 +488 @@
                         throw new IllegalDataException(
                                 tr(
-                                        "Relation with external id ''{0}'' refers to missing primitive with external id ''{1}''",
+                                        "Relation with external id ''{0}'' refers to missing primitive with external id ''{1}''.",
                                         externalRelationId,
                                         rm.id