Changeset 2822 in josm for trunk

Timestamp:

2010-01-12T07:16:18+01:00 (15 years ago)

Author:

Gubaer

Message:

see #4339: applied patch by andre68: MessageFormat fixes

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Version.java (modified) (1 diff)
• data/osm/OsmPrimitive.java (modified) (1 diff)
• gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (modified) (1 diff)
• gui/preferences/server/ProxyPreferencesPanel.java (modified) (1 diff)
• io/ChangesetQuery.java (modified) (1 diff)
• io/DefaultProxySelector.java (modified) (1 diff)
• io/OsmChangesetContentParser.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Version.java

@@ -138 +138 @@
         URL u = Main.class.getResource("/REVISION");
         if (u == null) {
-            System.err.println(tr("Warning: the revision file ''/REVISION'' is missing."));
+            System.err.println(tr("Warning: the revision file '/REVISION' is missing."));
             version = 0;
             revision = "";

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -1038 +1038 @@
             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "other"));
         if (other.isNew() ^ isNew())
-            throw new DataIntegrityProblemException(tr("Can''t merge because either of the participating primitives is new and the other is not"));
+            throw new DataIntegrityProblemException(tr("Can't merge because either of the participating primitives is new and the other is not"));
         if (! other.isNew() && other.getId() != id)
             throw new DataIntegrityProblemException(tr("Can''t merge primitives with different ids. This id is {0}, the other is {1}", id, other.getId()));

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java

@@ -940 +940 @@
         public void fillInQuery(ChangesetQuery query) {
             if (!isValidChangesetQuery())
-                throw new IllegalStateException(tr("Can''t restrict the changeset query to a specific bounding box. The input is invalid."));
+                throw new IllegalStateException(tr("Can't restrict the changeset query to a specific bounding box. The input is invalid."));
             query.inBbox(getBoundingBox());
         }

trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java

@@ -288 +288 @@
 
         if (pp.equals(ProxyPolicy.USE_SYSTEM_SETTINGS) && ! DefaultProxySelector.willJvmRetrieveSystemProxies()) {
-            System.err.println(tr("Warning: JOSM is configured to use proxies from the system setting, but the JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"));
+            System.err.println(tr("Warning: JOSM is configured to use proxies from the system setting, but the JVM is not configured to retrieve them. Resetting preferences to 'No proxy'"));
             pp = ProxyPolicy.NO_PROXY;
             rbProxyPolicy.get(pp).setSelected(true);

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

@@ -359 +359 @@
                 if (k.equals("uid")) {
                     if (queryParams.containsKey("display_name"))
-                        throw new ChangesetQueryUrlException(tr("Can''t create a changeset query including both the query parameters ''uid'' and ''display_name''"));
+                        throw new ChangesetQueryUrlException(tr("Can't create a changeset query including both the query parameters 'uid' and 'display_name'"));
                     csQuery.forUser(parseUid(queryParams.get("uid")));
                 } else if (k.equals("display_name")) {
                     if (queryParams.containsKey("uid"))
-                        throw new ChangesetQueryUrlException(tr("Can''t create a changeset query including both the query parameters ''uid'' and ''display_name''"));
+                        throw new ChangesetQueryUrlException(tr("Can't create a changeset query including both the query parameters 'uid' and 'display_name'"));
                     csQuery.forUser(queryParams.get("display_name"));
                 } else if (k.equals("open")) {

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

@@ -150 +150 @@
         case USE_SYSTEM_SETTINGS:
             if (!JVM_WILL_USE_SYSTEM_PROXIES) {
-                System.err.println(tr("Warning: the JVM is not configured to lookup proxies from the system settings. The property ''java.net.useSystemProxies'' was missing at startup time. Won't use a proxy."));
+                System.err.println(tr("Warning: the JVM is not configured to lookup proxies from the system settings. The property 'java.net.useSystemProxies' was missing at startup time. Won't use a proxy."));
                 return Collections.singletonList(Proxy.NO_PROXY);
             }

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

@@ -239 +239 @@
                     || qName.equals("relation")) {
                 if (currentModificationType == null) {
-                    throwException(tr("Illegal document structure. Found node, way, or relation outside of ''create'', ''modify'', or ''delete''."));
+                    throwException(tr("Illegal document structure. Found node, way, or relation outside of 'create', 'modify', or 'delete'."));
                 }
                 data.put(currentPrimitive, currentModificationType);