Changeset 26345 in osm for applications/editors/josm/plugins/graphview/src/org

Timestamp:

2011-07-16T21:10:43+02:00 (13 years ago)

Author:

stoecker

Message:

see #josm6227 - fix wrong quote escaping in strings

Location:

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview

Files:

• core/access/ImplicationXMLReader.java (modified) (1 diff)
• plugin/GraphViewPlugin.java (modified) (1 diff)
• plugin/preferences/VehiclePropertyStringParser.java (modified) (2 diffs)

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java

@@ -93 +93 @@
                 if (name.equals("condition")) {
                     if (!currentConditionReader.isFinished()) {
-                        throw new SAXException(tr("Condition isn't finished at </condition> tag"));
+                        throw new SAXException(tr("Condition isn''t finished at </condition> tag"));
                     } else {
                         currentCondition = currentConditionReader.getCondition();

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java

@@ -208 +208 @@
                 rulesetInputStream = rulesetURL.openStream();
             } else {
-                throw new FileNotFoundException(tr("Couldn't find built-in ruleset {0}", ruleset));
+                throw new FileNotFoundException(tr("Couldn''t find built-in ruleset {0}", ruleset));
             }
 

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java

@@ -36 +36 @@
     public static final String ERROR_LENGTH =
         tr("Lengths must be given as positive decimal numbers with unit \"m\", \"km\", \"mi\"" +
-        " or without unit.\nAlternatively, the format FEET' INCHES\" can be used.");
+        " or without unit.\nAlternatively, the format FEET'' INCHES\" can be used.");
     public static final String ERROR_SPEED =
         tr("Speeds should be given as numbers without unit or "
@@ -45 +45 @@
         tr("Tracktype grades must be given as integers between 0 and 5.");
     public static final String ERROR_SURFACE =
-        tr("Surface values must not contain any of the following characters: '','', ''{'',  ''}'', ''='', ''|''");
+        tr("Surface values must not contain any of the following characters: '','', '''{''',  '''}''', ''='', ''|''");
 
     private static final List<Character> FORBIDDEN_SURFACE_CHARS =