Changeset 16067 in josm for trunk/src/org

Timestamp:

2020-03-08T09:03:32+01:00 (5 years ago)

Author:

simon04

Message:

fix #18821, see #18302 - TaginfoAction: improve i18n

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• gui/dialogs/properties/TaginfoAction.java (modified) (2 diffs)
• tools/TaginfoRegionalInstance.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -373 +373 @@
             final LatLon center = newSel.iterator().next().getBBox().getCenter();
             Territories.getRegionalTaginfoUrls(center).stream()
-                    .map(taginfo -> new TaginfoAction(
+                    .map(taginfo -> new TaginfoAction(tr("Go to Taginfo ({0})", taginfo.toString()),
                             tagTable, editHelper::getDataKey, editHelper::getDataValues,
-                            membershipTable, x -> (IRelation<?>) membershipData.getValueAt(x, 0), taginfo.getUrl(),
-                            String.join("/", taginfo.getIsoCodes()) + (taginfo.getSuffix() == null ? "" : " (" + taginfo.getSuffix() + ")"))
+                            membershipTable, x -> (IRelation<?>) membershipData.getValueAt(x, 0), taginfo.getUrl())
                     ).forEach(taginfoNationalActions::add);
             taginfoNationalActions.stream().map(membershipMenu::add).forEach(membershipMenuTagInfoNatItems::add);

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TaginfoAction.java

@@ -44 +44 @@
     public TaginfoAction(JTable tagTable, IntFunction<String> tagKeySupplier, IntFunction<Map<String, Integer>> tagValuesSupplier,
             JTable membershipTable, IntFunction<IRelation<?>> memberValueSupplier) {
-        this(tagTable, tagKeySupplier, tagValuesSupplier, membershipTable, memberValueSupplier, TAGINFO_URL_PROP.get(), null);
+        this(tr("Go to Taginfo"), tagTable, tagKeySupplier, tagValuesSupplier, membershipTable, memberValueSupplier, TAGINFO_URL_PROP.get());
     }
 
     /**
      * Constructs a new {@code TaginfoAction} with a given URL and optional name suffix.
+     * @param name the action's text as displayed on the menu (if it is added to a menu)
      * @param tagTable The tag table. Cannot be null
      * @param tagKeySupplier Finds the key from given row of tag table. Cannot be null
@@ -55 +56 @@
      * @param memberValueSupplier Finds the parent relation from given row of membership table. Can be null
      * @param taginfoUrl Taginfo URL. Cannot be null
-     * @param suffix Optional name suffix, can be null
      * @since 15565
      */
-    public TaginfoAction(JTable tagTable, IntFunction<String> tagKeySupplier, IntFunction<Map<String, Integer>> tagValuesSupplier,
-            JTable membershipTable, IntFunction<IRelation<?>> memberValueSupplier, String taginfoUrl, String suffix) {
-        super(tr("Go to Taginfo") + (suffix != null ? " " + suffix : ""), "dialogs/taginfo",
+    public TaginfoAction(String name, JTable tagTable, IntFunction<String> tagKeySupplier, IntFunction<Map<String, Integer>> tagValuesSupplier,
+                         JTable membershipTable, IntFunction<IRelation<?>> memberValueSupplier, String taginfoUrl) {
+        super(name, "dialogs/taginfo",
                 tr("Launch browser with Taginfo statistics for selected object"), null, false);
         this.taginfoUrl = taginfoUrl.endsWith("/") ? taginfoUrl : taginfoUrl + '/';

trunk/src/org/openstreetmap/josm/tools/TaginfoRegionalInstance.java

@@ -62 +62 @@
         return suffix;
     }
+
+    @Override
+    public String toString() {
+        return (suffix == null ? "" : suffix + " ") + String.join("/", isoCodes);
+    }
 }