addshore wmde.5 update

.github/dependabot.yml

@@ -5,12 +5,8 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-- package-ecosystem: docker
+- package-ecosystem: npm
   directory: "/"
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: node
-    versions:
-    - "15"

.github/workflows/dependabot-gerrit.yml

@@ -0,0 +1,15 @@
+name: Dependabot to Gerrit
+on:
+  pull_request_target:
+    types: [opened, reopened, synchronize, closed]
+jobs:
+  open-or-update-change:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    steps:
+      - name: Run dependabot gerrit action
+        uses: wmde/dependabot-gerrit-action@main
+        with:
+            password: ${{ secrets.DEPENDABOT_GERRIT_PASSWORD }}
+            user: Addbot
+            email: addshorewiki+addbot-dependabot@gmail.com

.stylelintrc

@@ -3,7 +3,7 @@
 	"rules": {
 		"color-named": null,
 		"declaration-no-important": null,
-		"declaration-property-value-blacklist": null,
+		"declaration-property-unit-disallowed-list": null,
 		"no-descending-specificity": null,
 		"selector-max-id": null
 	}

Gruntfile.js

@@ -72,7 +72,8 @@ module.exports = function( grunt ) {
 		banana: {
 			all: 'i18n/',
 					options: {
-						disallowBlankTranslations: false
+						disallowBlankTranslations: false,
+						requireKeyPrefix: 'wdqs-'
 					}
 				},
 		clean: {
@@ -179,6 +180,10 @@ module.exports = function( grunt ) {
 							],
 							dest: buildFolder + '/default-config.json',
 							filter: 'isFile'
+						},
+						{// query builder dropdown image
+							src: 'wikibase/queryService/ui/304px_querybuilder_final.gif',
+							dest: buildFolder + '/',
 						}
 				]
 			}
@@ -335,7 +340,7 @@ module.exports = function( grunt ) {
 		'test', 'browser_test', 'clean', 'shell:cloneDeploy', 'clean:deploy', 'only_build'
 	] );
 	grunt.registerTask( 'deploy', [
-		'build-for-deploy', 'shell:commitDeploy', 'shell:review'
+		'build_for_deploy', 'shell:commitDeploy', 'shell:review'
 	] );
 	grunt.registerTask( 'security', [
 		'clean', 'shell:cloneDeploy', 'clean:deploy', 'only_build', 'shell:commitDeploy', 'shell:formatPatchDeploy'

default-config.json

@@ -14,7 +14,7 @@
     },
     "urlShortener": "tinyurl",
     "query-builder": {
-      "server": "https://query-builder-test.toolforge.org/"
+      "server": "https://query.wikidata.org/querybuilder/"
     }
   },
   "brand": {
@@ -27,5 +27,6 @@
     "root": "./",
     "index": "./index.html"
   },
+  "showBanner": false,
   "prefixes": {}
 }

embed.html

@@ -529,6 +529,7 @@ <h3 data-role="title" class="modal-title pull-left explorer-title">Explorer</h3>
 	<script src="wikibase/queryService/api/Tracking.js"></script>
 	<script src="wikibase/queryService/api/UrlShortener.js"></script>
 	<script src="wikibase/queryService/RdfNamespaces.js"></script>
+	<script src="wikibase/queryService/ui/Banner.js"></script>
 	<script src="wikibase/queryService/ui/queryHelper/QueryHelper.js"></script>
 	<script src="wikibase/queryService/ui/queryHelper/SparqlQuery.js"></script>
 	<script src="wikibase/queryService/ui/queryHelper/SelectorBox.js"></script>

examples/code/Java.txt

@@ -1,41 +1,29 @@
-// https://github.com/BorderCloud/SPARQL-JAVA
-import com.bordercloud.sparql.Endpoint;
-import com.bordercloud.sparql.EndpointException;
-import java.util.ArrayList;
-import java.util.HashMap;
+// https://github.com/eclipse/rdf4j
+import org.eclipse.rdf4j.query.resultio.sparqljson.SPARQLResultsJSONWriter;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sparql.SPARQLRepository;
+import java.util.Collections;
 
-public class Main {
+/**
+ * Wikidata RDF4J SPARQL example
+ */
+public class App
+{
+    public static void main( String[] args )
+    {
+        String sparqlEndpoint = "{ENDPOINT_URL}";
+        SPARQLRepository repo = new SPARQLRepository(sparqlEndpoint);
 
-    public static void main(String[] args) {
-        String endpointUrl = "{ENDPOINT_URL}";
+        String userAgent = "Wikidata RDF4J Java Example/0.1 (https://query.wikidata.org/)";
+        repo.setAdditionalHttpHeaders( Collections.singletonMap("User-Agent", userAgent ) );
 
         String querySelect = {SPARQL_QUERY};
 
-        try {
-            HashMap data = retrieveData(endpointUrl, querySelect);
-            printResult(data, 30);
-        } catch (EndpointException eex) {
-            eex.printStackTrace();
+        try{
+            repo.getConnection().prepareTupleQuery(querySelect).evaluate(new SPARQLResultsJSONWriter(System.out));
+        } catch ( Exception exception ) {
+            exception.printStackTrace();
         }
-    }
-
-    public static HashMap<String, HashMap> retrieveData(String endpointUrl, String query) throws EndpointException {
-        Endpoint sp = new Endpoint(endpointUrl, false);
-        sp.setUserAgentRequestHeader("WDQS-Example Java"); // TODO adjust this; see https://w.wiki/CX6
-        HashMap<String, HashMap> rs = sp.query(query);
-        return rs;
-    }
 
-    public static void printResult(HashMap<String, HashMap> rs , int size) {
-      for (String variable : (ArrayList<String>) rs.get("result").get("variables")) {
-        System.out.print(String.format("%-"+size+"."+size+"s", variable ) + " | ");
-      }
-      System.out.print("\n");
-      for (HashMap value : (ArrayList<HashMap>) rs.get("result").get("rows")) {
-        for (String variable : (ArrayList<String>) rs.get("result").get("variables")) {
-          System.out.print(String.format("%-"+size+"."+size+"s", value.get(variable)) + " | ");
-        }
-        System.out.print("\n");
-      }
     }
-}
+}

i18n/ab.json

@@ -1,6 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
+			"Fraxinus.cs",
 			"Pupsik-ipa",
 			"Андрей"
 		]
@@ -25,7 +26,7 @@
 	"wdqs-app-result-csv": "CSV-афаил",
 	"wdqs-dialog-examples-preview-result": "Иахәаԥштәуп алҵшәа",
 	"wdqs-dialog-key-shortcut-close-button": "Иарктәуп",
-	"wdqs-ve-filter": "Афильтр",
+	"wdqs-ve-filter": "Араӡага",
 	"wdqs-ve-show": "Иаарԥштәуп",
 	"wdqs-ve-or": "ма",
 	"wdqs-ve-sb-other": "Даҽакы",

i18n/af.json

@@ -3,18 +3,30 @@
 		"authors": [
 			"Fwolff",
 			"Naudefj",
-			"Taalvalk"
+			"Taalvalk",
+			"Winstonza"
 		]
 	},
 	"wdqs-app-button-examples": "Voorbeelde",
 	"wdqs-app-button-prefixes": "Voorvoegsels",
+	"wdqs-app-button-more-tools": "Nog werktuie",
 	"wdqs-app-button-help": "Hulp",
 	"wdqs-app-button-run": "Loop",
-	"wdqs-app-button-run-title": "Voer soekopdrag uit (<CTRL> + <ENTER>)",
+	"wdqs-app-button-run-title": "Voer soekopdrag uit (CTRL + ENTER)",
 	"wdqs-app-button-clear": "Vee uit",
+	"wdqs-app-button-clear-title": "Wis soekopdrag",
+	"wdqs-app-button-restore-title": "Herstel vorige soekopdrag",
+	"wdqs-app-button-format-title": "Formaatsoektog",
+	"wdqs-app-button-query-helper": "Uitleg oor die vraagstelling",
+	"wdqs-app-button-fullscreen-title": "Skakel die volledige skermmodus van die redigeerder aan",
 	"wdqs-app-button-display": "Wys",
+	"wdqs-app-button-display-title": "Wys die resultaat as tabel, beeld, ...",
 	"wdqs-app-button-download": "Laai af",
+	"wdqs-app-button-download-title": "Laai resultaat af",
 	"wdqs-app-button-link": "Skakel",
+	"wdqs-app-button-link-title": "Kry 'n skakel na die soekopdrag",
+	"wdqs-app-button-code": "Kode",
+	"wdqs-app-button-code-title": "Bekyk kodevoorbeelde",
 	"wdqs-app-help-feedback": "Gee terugvoer!",
 	"wdqs-app-help-request-query": "Soekopdrag aanvra",
 	"wdqs-app-help-portal": "Hulpportaal",
@@ -23,31 +35,84 @@
 	"wdqs-app-help-datamodel": "RDF-datamodel",
 	"wdqs-app-help-prefixes": "Lys van voorvoegsels",
 	"wdqs-app-help-copy": "Lisensie-inligting",
+	"wdqs-app-help-queryhelper": "Soekopdrag-assistent",
+	"wdqs-app-logout": "Meld af",
+	"wdqs-app-tools-edit-items": "Bewerk items",
+	"wdqs-app-tools-enhance-ui": "Verbeter gebruikerskoppelvlak",
+	"wdqs-app-tools-visualize-data": "Visualiseer data",
+	"wdqs-app-tools-list-properties": "Lyseienskappe",
+	"wdqs-app-tools-lexicographical-data": "Leksikografiese data",
+	"wdqs-app-tools-for-programmers": "Vir programmeerders",
 	"wdqs-app-footer-help": "Druk <i>[CTRL-SPASIE]</i> om outomatiese invul te aktiveer.",
+	"wdqs-app-footer-updated-ago": "Data bygewerk $1",
 	"wdqs-app-result-shorturl": "Kort URL na resultaat",
 	"wdqs-app-result-shorturl-title": "Kort URL na dié resultaat",
+	"wdqs-app-result-embed": "Lê resultaat vas",
+	"wdqs-app-result-endpoint": "SPARQL endpoint",
 	"wdqs-app-result-json": "JSON-lêer",
 	"wdqs-app-result-json-verbose": "JSON-lêer (spraaksaam)",
 	"wdqs-app-result-tsv": "TSV-lêer",
 	"wdqs-app-result-tsv-verbose": "TSV-lêer (spraaksaam)",
 	"wdqs-app-result-csv": "CSV-lêer",
 	"wdqs-app-result-svg": "SVG-beeld",
+	"wdqs-app-result-html": "HTML-tabel",
 	"wdqs-app-shorturl-page-title": "Kort URL na dié bladsy",
 	"wdqs-app-editor-placeholder": "(Tik 'n SPARQL-navraag of kies 'n voorbeeld van 'n navraag)",
 	"wdqs-app-editor-addprefixes": "Voeg standaardvoorvoegsels by",
+	"wdqs-app-resultbrowser-response-summary": "$1 {{PLURAL:$1|resultaat|resultate}} in $2&nbsp;ms",
 	"wdqs-app-resultbrowser-stabilize": "Stabiliseer netwerk",
 	"wdqs-app-resultbrowser-hierarchical-lr": "Hiërargiese uitleg van links na regs",
 	"wdqs-app-resultbrowser-hierarchical-ud": "Hiërargiese uitleg van bo na onder",
 	"wdqs-app-resultbrowser-hierarchical-rl": "Hiërargiese uitleg van regs na links",
+	"wdqs-app-resultbrowser-non-hierarchical": "Niehiërargiese uitleg",
+	"wdqs-app-resultbrowser-table": "Tabel",
+	"wdqs-app-resultbrowser-map": "Kaart",
+	"wdqs-app-resultbrowser-line-chart": "Lyngrafiek",
+	"wdqs-app-resultbrowser-bar-chart": "Staafgrafiek",
+	"wdqs-app-resultbrowser-scatter-chart": "Spreidingsgrafiek",
+	"wdqs-app-resultbrowser-timeline": "Tydlyn",
+	"wdqs-app-resultbrowser-dimensions": "Dimensies",
+	"wdqs-app-resultbrowser-graph": "Grafiek",
+	"wdqs-app-toast-leave-fullscreen": "Druk [esc] om volskerm toe te maak",
+	"wdqs-app-urlshortener-loading": "Laai tans...",
+	"wdqs-dialog-examples-preview-query": "Voorskou van soektog",
+	"wdqs-dialog-examples-preview-result": "Resultaat van voorskou",
+	"wdqs-dialog-key-shortcut-title": "Sleutelbordkortpaaie",
+	"wdqs-dialog-key-shortcut-run-query": "Voer soekopdrag uit.",
+	"wdqs-dialog-key-shortcut-esc": "Verlaat die huidige invoerveld/teksgebied.",
+	"wdqs-dialog-key-shortcut-show-shortcut-help": "Toon sleutelbordkortpaaie vir die huidige bladsy.",
+	"wdqs-dialog-key-shortcut-focus-textarea": "Fokus op teksveldsoekopdrag",
+	"wdqs-dialog-key-shortcut-jump-to-result": "Gaan na soekopdragresultaat.",
+	"wdqs-dialog-key-shortcut-show-example": "Wys voorbeelde.",
+	"wdqs-dialog-key-shortcut-help-menu": "Skakel die helpkieslys aan.",
+	"wdqs-dialog-key-shortcut-show-language": "Wys taalkieslys.",
+	"wdqs-dialog-key-shortcut-close-button": "Maak toe",
+	"wdqs-ve-filter": "Filter",
 	"wdqs-ve-show": "Wys",
+	"wdqs-ve-limit": "Limiet",
+	"wdqs-ve-remove-row-title": "Verwyder die ry",
 	"wdqs-ve-with": "met",
 	"wdqs-ve-anything": "alles",
 	"wdqs-ve-any": "enige",
 	"wdqs-ve-or": "of",
 	"wdqs-ve-subtype": "subtipe",
+	"wdqs-ve-sb-suggestions": "Voorstelle",
 	"wdqs-ve-sb-other": "Ander",
+	"wdqs-action-query": "Voer soekopdrag uit",
+	"wdqs-action-render": "Vertoon resultaat",
 	"wdqs-action-error-display": "Kan nie resultaat vertoon nie",
+	"wdqs-action-timeout": "Tydlimiet vir soekopdrag bereik",
+	"wdqs-action-malformed-query": "Soekopdrag is ongeldig",
+	"wdqs-action-empty-query": "Vul 'n geldige SPARQL-soekopdrag in of kies 'n voorbeeldsoekopdrag",
 	"wdqs-action-server-error": "Bedienerfout",
 	"wdqs-action-unknow-error": "Onbekende fout",
-	"wdqs-result-map-layers-all": "Alle lae"
+	"wdqs-action-preview": "Resultaatvoorskou",
+	"wdqs-result-map-layers-all": "Alle lae",
+	"wdqs-result-map-progress": "Laai kaartdata: $1%",
+	"wdqs-embed-button-edit-query": "Werk visueel by",
+	"wdqs-embed-button-edit-query-title": "Redigeer dié soektog met die soektoghulpmiddel",
+	"wdqs-embed-button-edit-code": "Redigeer SPARQL",
+	"wdqs-embed-button-edit-code-title": "Redigeer dié soekopdrag met die SPARQL-redigeerder",
+	"wdqs-embed-explorer-button-incoming": "Wys inkomende skakels",
+	"wdqs-embed-explorer-button-outgoing": "Wys uitgaande skakels"
 }

i18n/ary.json

@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"Ayoubbouamri"
+			"Ayoubbouamri",
+			"Ideophagous"
 		]
 	},
 	"wdqs-app-button-examples": "شانتيو",
@@ -30,15 +31,15 @@
 	"wdqs-app-help-manual": "لڭيد",
 	"wdqs-app-help-examples": "شانتيو ديال لونكيط",
 	"wdqs-app-help-datamodel": "شانتيو ديال بيانات RDF",
-	"wdqs-app-help-prefixes": "ليسطا ديال لبدايات",
+	"wdqs-app-help-prefixes": "ليستة ديال لبدايات",
 	"wdqs-app-help-copy": "معلومات على لّيصونص",
 	"wdqs-app-help-queryhelper": "مساعد لونكيط",
 	"wdqs-app-logout": "خرج",
 	"wdqs-app-tools-edit-items": "بدّل لقوانين",
 	"wdqs-app-tools-query-data": "اونكيط على لبيانات",
 	"wdqs-app-tools-enhance-ui": "دفع لانطيرفاص لما حسن",
 	"wdqs-app-tools-visualize-data": "تصور لبيانات",
-	"wdqs-app-tools-list-properties": "ليسطا د لمميزات",
+	"wdqs-app-tools-list-properties": "ليستة د لمميزات",
 	"wdqs-app-tools-lexicographical-data": "بيانات قاموسية",
 	"wdqs-app-tools-for-programmers": "ديال لموبرمجين(ات)",
 	"wdqs-app-footer-help": "برك <i>[CTRL-SPACE]</i> باش تأكتيڤي لأوطو مسالية",
@@ -97,8 +98,8 @@
 	"wdqs-dialog-key-shortcut-focus-show": "ركّز على لبوطونة ديال \"ورّي\" فمساعد لونكيط",
 	"wdqs-dialog-key-shortcut-focus-limit": "برك على لبوطونة ديال \"لحد\" فمساعد لونكيط",
 	"wdqs-dialog-key-shortcut-show-example": "ورّي شانتيوات",
-	"wdqs-dialog-key-shortcut-help-menu": "بدّل ليسطا ديال لمعاونة",
-	"wdqs-dialog-key-shortcut-show-language": "ورّي ليسطا ديال لوغات",
+	"wdqs-dialog-key-shortcut-help-menu": "بدّل ليستة ديال لمعاونة",
+	"wdqs-dialog-key-shortcut-show-language": "ورّي ليستة ديال لوغات",
 	"wdqs-dialog-key-shortcut-close-button": "سدّ",
 	"wdqs-ve-filter": "فيلتر",
 	"wdqs-ve-show": "ورّي",

i18n/ast.json

@@ -2,6 +2,7 @@
 	"@metadata": {
 		"authors": [
 			"Enolp",
+			"Tokvo",
 			"Xuacu"
 		]
 	},
@@ -10,7 +11,7 @@
 	"wdqs-app-button-more-tools": "Más ferramientes",
 	"wdqs-app-button-help": "Ayuda",
 	"wdqs-app-button-run": "Executar",
-	"wdqs-app-button-run-title": "Executar consulta (<CTRL> + <ENTER>)",
+	"wdqs-app-button-run-title": "Executar consulta (CTRL + ENTER)",
 	"wdqs-app-button-clear": "Llimpiar",
 	"wdqs-app-button-clear-title": "Llimpiar consulta",
 	"wdqs-app-button-restore-title": "Restaurar la consulta anterior",

i18n/az.json

@@ -15,9 +15,9 @@
 	"wdqs-app-button-more-tools": "Digər alətlər",
 	"wdqs-app-button-help": "Kömək",
 	"wdqs-app-button-run": "İşlət",
-	"wdqs-app-button-run-title": "Sorğunu yerinə yetir",
+	"wdqs-app-button-run-title": "Sorğunu yerinə yetir (CTRL + ENTER)",
 	"wdqs-app-button-clear": "Təmizlə",
-	"wdqs-app-button-clear-title": "Sifarişi sil",
+	"wdqs-app-button-clear-title": "Sorğunu sil",
 	"wdqs-app-button-restore-title": "Əvvəlki sorğunu bərpa edin",
 	"wdqs-app-button-fullscreen-title": "Tam ekran rejimində redaktoru aç/bağla",
 	"wdqs-app-button-display": "Göstər",
@@ -30,12 +30,12 @@
 	"wdqs-app-button-code-title": "Kod nümunələrini göstər",
 	"wdqs-app-help-feedback": "Rəy ver!",
 	"wdqs-app-help-request-query": "Sorğu istəyin",
-	"wdqs-app-help-portal": "Yardım portali",
+	"wdqs-app-help-portal": "Yardım portalı",
 	"wdqs-app-help-manual": "İstifadəçi təlimatı",
 	"wdqs-app-help-examples": "Sorğu nümunələri",
 	"wdqs-app-help-datamodel": "RDF Məlumat Modeli",
 	"wdqs-app-help-prefixes": "Prefikslərin siyahısı",
-	"wdqs-app-help-copy": "Lisenziyalaşdırılmış məlumat",
+	"wdqs-app-help-copy": "Lisenziyala məlumatı",
 	"wdqs-app-help-queryhelper": "Sorğu köməkçisi",
 	"wdqs-app-logout": "Çıxış",
 	"wdqs-app-tools-for-programmers": "Proqramçılar üçün",
@@ -119,9 +119,9 @@
 	"wdqs-action-preview": "Nəticənin sınaq göstərişi",
 	"wdqs-result-map-layers-all": "Bütün qatlar",
 	"wdqs-result-map-progress": "Xəritə məlumatları yüklənir: $1",
-	"wdqs-embed-button-edit-query": "Redaktə",
+	"wdqs-embed-button-edit-query": "Vizual redaktə",
 	"wdqs-embed-button-edit-query-title": "Bu müraciəti kömətçi vasitəsilə dəyiş",
-	"wdqs-embed-button-edit-code": "Kodu dəyiş",
+	"wdqs-embed-button-edit-code": "SPARQL redaktə",
 	"wdqs-embed-button-edit-code-title": "Bu  sorğunu SPARQL redaktəçisi ilə redaktə et",
 	"wdqs-embed-explorer-button-incoming": "Giriş mündəraciyətləri göstər",
 	"wdqs-embed-explorer-button-outgoing": "Çıxan mündəraciyətləri göstər"