Changeset 8091 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2015-02-21T15:27:40+01:00 (10 years ago)

Author:

stoecker

Message:

proper handling of language infor for maps name and description

File:

• trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (5 diffs)

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

@@ -28 +28 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.LanguageInfo;
 
 /**
@@ -152 +153 @@
     /** name of the imagery entry (gets translated by josm usually) */
     private String name;
-    /** original name of the imagery entry in case of translation call */
+    /** original name of the imagery entry in case of translation call, for multiple languages English when possible */
     private String origName;
+    /** (original) language of the translated name entry */
+    private String langName;
     /** id for this imagery entry, optional at the moment */
     private String id;
@@ -166 +169 @@
     private ImageryBounds bounds = null;
     private List<String> serverProjections;
+    /** description of the imagery entry, should contain notes what type of data it is */
     private String description;
+    /** language of the description entry, "" for tr() result */
+    private String langDescription;
     private String attributionText;
     private String attributionLinkURL;
@@ -686 +692 @@
 
     /**
-     * Sets the entry name and translates it.
+     * Sets the entry name and handle translation.
+     * @param name The used language
      * @param name The entry name
-     * @since 6968
-     */
-    public void setTranslatedName(String name) {
-        this.name = tr(name);
-        this.origName = name;
+     * @since 8091
+     */
+    public void setName(String language, String name) {
+        boolean isdefault = LanguageInfo.getJOSMLocaleCode(null).equals(language);
+        if(LanguageInfo.isBetterLanguage(langName, language)) {
+            this.name = isdefault ? tr(name) : name;
+            this.langName = language;
+        }
+        if(origName == null || isdefault) {
+            this.origName = name;
+        }
     }
 
@@ -791 +804 @@
     /**
      * Sets the description text when existing.
+     * @param name The used language
      * @param description the imagery description text
-     * @since 8065
-     */
-    public void setDescription(String description) {
-        this.description = description;
+     * @since 8091
+     */
+    public void setDescription(String language, String description) {
+        boolean isdefault = LanguageInfo.getJOSMLocaleCode(null).equals(language);
+        if(LanguageInfo.isBetterLanguage(langDescription, language)) {
+            this.description = isdefault ? tr(description) : description;
+            this.langDescription = language;
+        }
     }