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

Timestamp:

2020-08-30T22:19:00+02:00 (4 years ago)

Author:

simon04

Message:

fix #19736 - MapStatus displays non-localized SystemOfMeasurement name

File:

• trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java (modified) (3 diffs)

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.marktr;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.text.NumberFormat;
@@ -127 +128 @@
     /**
      * Sets the current global system of measurement.
-     * @param somKey The system of measurement key. Must be defined in {@link SystemOfMeasurement#ALL_SYSTEMS}.
+     * @param som The system of measurement to set. Must be defined in {@link SystemOfMeasurement#ALL_SYSTEMS}.
      * @throws IllegalArgumentException if {@code somKey} is not known
-     * @since 8554
-     */
-    public static void setSystemOfMeasurement(String somKey) {
+     * @since xxx (signature)
+     */
+    public static void setSystemOfMeasurement(SystemOfMeasurement som) {
+        String somKey = som.getName();
         if (!SystemOfMeasurement.ALL_SYSTEMS.containsKey(somKey)) {
             throw new IllegalArgumentException("Invalid system of measurement: "+somKey);
@@ -285 +287 @@
 
     /**
+     * Returns the localized name of this system of measurement
+     * @return the localized name
+     */
+    @Override
+    public String toString() {
+        return tr(name);
+    }
+
+    /**
      * Returns the default system of measurement for the current country.
      * @return the default system of measurement for the current country