Changeset 6968 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2014-04-10T20:59:12+02:00 (10 years ago)

Author:

stoecker

Message:

also store untranslated imagery name

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryInfo.java (modified) (4 diffs)
• io/imagery/ImageryReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.imagery;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Image;
@@ -145 +147 @@
     }
 
+    /** name of the imagery entry (gets translated by josm usually) */
     private String name;
+    /** original name of the imagery entry in case of translation call */
+    private String origName;
     private String url = null;
     private boolean defaultEntry = false;
@@ -562 +567 @@
 
     /**
+     * Returns the entry name.
+     * @return The entry name
+     * @since 6968
+     */
+    public String getOriginalName() {
+        return this.origName != null ? this.origName : this.name;
+    }
+
+    /**
      * Sets the entry name.
      * @param name The entry name
@@ -567 +581 @@
     public void setName(String name) {
         this.name = name;
+    }
+
+    /**
+     * Sets the entry name and translates it.
+     * @param name The entry name
+     * @since 6968
+     */
+    public void setTranslatedName(String name) {
+        this.name = tr(name);
+        this.origName = name;
     }
 

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -202 +202 @@
             case ENTRY_ATTRIBUTE:
                 if (qName.equals("name")) {
-                    entry.setName(tr(accumulator.toString()));
+                    entry.setTranslatedName(accumulator.toString());
                 } else if (qName.equals("type")) {
                     boolean found = false;