Changeset 1989 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-08-23T19:34:25+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3281: OsmPrimitiveType fails for fusional and/or agglutinative languages

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• MultiFetchServerObjectReader.java (modified) (2 diffs)
• OsmServerWriter.java (modified) (2 diffs)

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

@@ -365 +365 @@
         for (long id : pkg) {
             try {
-                progressMonitor.setCustomText(tr("Fetching {0} with id {1} from ''{2}''", type.getLocalizedDisplayNameSingular(), id, OsmApi.getOsmApi().getBaseUrl()));
+                String msg = "";
+                switch(type) {
+                case NODE: msg = tr("Fetching node with id {0} from ''{1}''", id, OsmApi.getOsmApi().getBaseUrl()); break;
+                case WAY: msg = tr("Fetching way with id {0} from ''{1}''", id, OsmApi.getOsmApi().getBaseUrl()); break;
+                case RELATION: msg = tr("Fetching relation with id {0} from ''{1}''", id, OsmApi.getOsmApi().getBaseUrl()); break;
+                }
+                progressMonitor.setCustomText(msg);
                 singleGetId(type, id, progressMonitor);
             } catch(OsmApiException e) {
@@ -397 +403 @@
      */
     protected void fetchPrimitives(Set<Long> ids, OsmPrimitiveType type, ProgressMonitor progressMonitor) throws OsmTransferException{
-        progressMonitor.setCustomText(tr("Fetching a package of {0} from ''{1}''", type.getLocalizedDisplayNameSingular(), OsmApi.getOsmApi().getBaseUrl()));
+        String msg = "";
+        switch(type) {
+        case NODE: msg = tr("Fetching a package of nodes from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
+        case WAY:  msg = tr("Fetching a package of ways from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
+        case RELATION:  msg = tr("Fetching a package of relations from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
+        }
+        progressMonitor.setCustomText(msg);
         Set<Long> toFetch = new HashSet<Long>(ids);
         toFetch.addAll(ids);

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.marktr;
 
 import java.util.Collection;
@@ -95 +96 @@
                 int progress = progressMonitor.getTicks();
                 String time_left_str = timeLeft(progress, primitives.size());
+                String msg = "";
+                switch(OsmPrimitiveType.from(osm)) {
+                case NODE: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"); break;
+                case WAY: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"); break;
+                case RELATION: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"); break;
+                }
                 progressMonitor.subTask(
-                        tr("{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})",
-                                Math.round(100.0*progress/primitives.size()), progress,
-                                primitives.size(), time_left_str,
-                                OsmPrimitiveType.from(osm).getLocalizedDisplayNameSingular(),
+                        tr(msg,
+                                Math.round(100.0*progress/primitives.size()),
+                                progress,
+                                primitives.size(),
+                                time_left_str,
                                 NAME_FORMATTER.getName(osm),
                                 osm.id));