Changeset 31861 in osm

Timestamp:

2015-12-25T21:27:09+01:00 (9 years ago)

Author:

simon04

Message:

JOSM/wikipedia: Add fallback Wikidata label fetching - see #josm9775

Fetch Wikidata label in any language if neither program language nor English are present.

File:

• applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java (modified) (1 diff)

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java

@@ -211 +211 @@
                     "&props=labels" +
                     "&ids=" + wikidataId +
-                    "&languages=" + preferredLanguage +
-                    "&languagefallback=en" +
-                    "&format=xml";
+                    "&format=xml" +
+                    (preferredLanguage != null ? "&languages=" + preferredLanguage + "&languagefallback=en" : "");
             Main.info("Wikipedia: GET " + url);
             try (final InputStream in = Utils.openURL(new URL(url))) {
                 final Document xml = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(in);
                 final Node label = (Node) XPathFactory.newInstance().newXPath().compile("//label").evaluate(xml, XPathConstants.NODE);
-                if (label == null) {
+                if (label == null && preferredLanguage != null) {
+                    return getLabelForWikidata(wikidataId, null);
+                } else if (label == null) {
                     return null;
                 } else {