Changeset 15711 in josm for trunk

Timestamp:

2020-01-14T21:55:56+01:00 (5 years ago)

Author:

simon04

Message:

see #14465 - Tag2Link: restrict names by JOSM language

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• LanguageInfo.java (modified) (2 diffs)
• Tag2Link.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -288 +288 @@
      */
     public static List<String> getLanguageCodes(Locale l) {
-        List<String> list = new LinkedList<>();
+        List<String> list = new ArrayList<>(4);
         if (l == null)
             l = Locale.getDefault();

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

@@ -12 +12 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -42 +43 @@
      * Maps OSM keys to formatter URLs from Wikidata and OSM Sophox where {@code "$1"} has to be replaced by a value.
      */
-    static MultiMap<String, String> wikidataRules = new MultiMap<>();
+    static final MultiMap<String, String> wikidataRules = new MultiMap<>();
+
+    static final String languagePattern = LanguageInfo.getLanguageCodes(null).stream()
+            .map(Pattern::quote)
+            .collect(Collectors.joining("|"));
 
     private Tag2Link() {
@@ -127 +132 @@
 
         // Search
-        if (key.matches("^(.+[:_])?name([:_].+)?$")) {
+        if (key.matches("^(.+[:_])?name([:_]" + languagePattern + ")?$")) {
             linkConsumer.acceptLink(tr("Search on DuckDuckGo"), "https://duckduckgo.com/?q=" + value);
         }