From 82837d9e33a4d9679b46b527aa737887f529c6e7 Mon Sep 17 00:00:00 2001
From: kjon <kjon@gmx.de>
Date: Wed, 12 Jan 2022 13:14:23 +0000
Subject: [PATCH 1/6] Translated using Weblate (German)
Currently translated at 100.0% (332 of 332 strings)
Translation: MapComplete/Core
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/de/
---
langs/de.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/langs/de.json b/langs/de.json
index a8c3e585a..1b12541c8 100644
--- a/langs/de.json
+++ b/langs/de.json
@@ -59,7 +59,7 @@
"confirmButton": "Fügen Sie hier eine {category} hinzu.<br><div class=\"alert\">Ihre Ergänzung ist für alle sichtbar</div>",
"openLayerControl": "Das Ebenen-Kontrollkästchen öffnen",
"layerNotEnabled": "Die Ebene {layer} ist nicht aktiviert. Aktivieren Sie diese Ebene, um einen Punkt hinzuzufügen",
- "addNewMapLabel": "Neues Element hinzufügen",
+ "addNewMapLabel": "Hier klicken, um ein neues Element hinzuzufügen",
"presetInfo": "Der neue POI hat {tags}",
"disableFiltersExplanation": "Einige Elemente können durch einen Filter ausgeblendet sein",
"disableFilters": "Alle Filter deaktivieren",
From 6ced1c863193570e5baa78b7264e14f6f27211f1 Mon Sep 17 00:00:00 2001
From: Supaplex <bejokeup@gmail.com>
Date: Tue, 11 Jan 2022 17:02:40 +0000
Subject: [PATCH 2/6] Translated using Weblate (Chinese (Traditional))
Currently translated at 88.8% (295 of 332 strings)
Translation: MapComplete/Core
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/zh_Hant/
---
langs/zh_Hant.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/langs/zh_Hant.json b/langs/zh_Hant.json
index d78897f31..ce3b891db 100644
--- a/langs/zh_Hant.json
+++ b/langs/zh_Hant.json
@@ -251,7 +251,7 @@
"disableFilters": "關閉所有篩選器",
"disableFiltersExplanation": "有些圖徵可能被篩選器隱藏",
"presetInfo": "新的興趣點有 {tags}",
- "addNewMapLabel": "新增新項目",
+ "addNewMapLabel": "點這邊新增新項目",
"warnVisibleForEveryone": "你新增的東西將會被所有人看到",
"zoomInMore": "再放大來匯入這一圖徵"
},
From ef78c63c01d4d12a4b1ebd88907bc48f5e226e0b Mon Sep 17 00:00:00 2001
From: Supaplex <bejokeup@gmail.com>
Date: Tue, 11 Jan 2022 14:48:29 +0000
Subject: [PATCH 3/6] Translated using Weblate (Chinese (Traditional))
Currently translated at 54.5% (230 of 422 strings)
Translation: MapComplete/themes
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/zh_Hant/
---
langs/themes/zh_Hant.json | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/langs/themes/zh_Hant.json b/langs/themes/zh_Hant.json
index db3f47313..de1192b08 100644
--- a/langs/themes/zh_Hant.json
+++ b/langs/themes/zh_Hant.json
@@ -654,5 +654,10 @@
"description": "在這份地圖當中，你可以找到你附近的垃圾筒。如果地圖有遺漏垃圾筒，你可以自己加上去",
"shortDescription": "垃圾筒的地圖",
"title": "垃圾筒"
+ },
+ "entrances": {
+ "description": "顯示所有出入口的地圖，勘查對輪椅使用者重要的資訊",
+ "shortDescription": "幫助輪椅導航來勘查出入口",
+ "title": "出入口"
}
-}
\ No newline at end of file
+}
From eba52836b260a2b95f1176b54484758bf56c093a Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Fri, 14 Jan 2022 15:46:45 +0100
Subject: [PATCH 4/6] Cosmetic changes to toerisme_vlaanderen theme
---
.../bike_repair_station.json | 3 +-
.../toerisme_vlaanderen.json | 22 +++---
css/index-tailwind-output.css | 72 +++++++++++++------
3 files changed, 68 insertions(+), 29 deletions(-)
diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json
index e66850702..558456c48 100644
--- a/assets/layers/bike_repair_station/bike_repair_station.json
+++ b/assets/layers/bike_repair_station/bike_repair_station.json
@@ -771,6 +771,7 @@
}
],
"description": {
- "en": "A layer showing bicycle pumps and bicycle repair tool stands"
+ "en": "A layer showing bicycle pumps and bicycle repair tool stands",
+ "nl": "Deze laag toont fietspompen en herstelpunten voor fietsen"
}
}
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
index 9f5f0c3cc..daca2042b 100644
--- a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
+++ b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
@@ -2,7 +2,7 @@
"id": "toerisme_vlaanderen",
"credits": "Commissioned theme for <a href='https://www.toerismevlaanderen.be/'>Toerisme Vlaandere</a>",
"maintainer": "MapComplete",
- "version": "0.0.1",
+ "version": "0.0.2",
"customCss": "./assets/themes/toerisme_vlaanderen/custom.css",
"language": [
"en",
@@ -12,18 +12,18 @@
"nl"
],
"title": {
- "nl": "Toeristisch relevante info"
+ "nl": "Pin je punt"
},
"shortDescription": {
"nl": "Een kaart om toeristisch relevante info op aan te duiden"
},
"description": {
- "nl": "Op deze kaart kan je info zien die relevant is voor toerisme, zoals:<br/><ul><li>Eetgelegenheden</li><li>Cafés en bars</li><li>(Fiets)oplaadpunten</li><li>Fietspompen, fietserverhuur en fietswinkels</li><li>Uitkijktorens</li><li>...</li></ul> Zie je fouten op de kaart? Dan kan je zelf makkelijk aanpasingen maken, die zichtbaar zijn voor iedereen. Hiervoor dien je een gratis OpenStreetMap account voor te maken."
+ "nl": "<p class='mb-4'><i>Pin je punt</i> is een open toerismekaart waarin wandelaars en fietsers nuttige gegevens verzamelen die handig zijn voor andere wandelaars en fietsers.</p><p class='mb-4'>We verzamelen 7 thematische lagen: <ol><li>Laadpunten voor e-bikes</li><li>Openbare toiletten</li><li>Zit- en picknickbankjes</li><li>Uitkijkpunten, uitkijkplatformen en uitkijktorens</li><li>Fietsherstelpunten</li><li>Fietsverhuurpunten</li><li>Speeltuinen</li></ol><p>Klik op de exacte locatie op de kaart om een van deze 7 punten toe te voegen. Of corrigeer bestaande punten door erop te klikken.</p>"
},
"descriptionTail": {
- "nl": "Met de steun van Toerisme Vlaanderen<img style='height:5rem; width: auto;' src='./assets/themes/toerisme_vlaanderen/logo.png' />"
+ "nl": "<p>Met de steun van Toerisme Vlaanderen</p><a href='https://www.toerismevlaanderen.be/pinjepunt'>Meer informatie op toerismevlaaneren.be</a><img style='height:5rem; width: auto;' src='./assets/themes/toerisme_vlaanderen/logo.png' />"
},
- "icon": "./assets/svg/star.svg",
+ "icon": "./assets/svg/teardrop_with_hole_green.svg",
"startZoom": 8,
"startLat": 50.8536,
"startLon": 4.433,
@@ -31,13 +31,19 @@
"layers": [
{
"builtin": [
- "charging_station",
- "toilet"
+ "toilet",
+ "bench",
+ "picnic_table",
+ "observation_tower",
+ "bike_repair_station",
+ "playground",
+ "charging_station"
],
"override": {
"minzoom": 14
}
}
],
- "hideFromOverview": true
+ "hideFromOverview": true,
+ "enableMoreQuests": false
}
\ No newline at end of file
diff --git a/css/index-tailwind-output.css b/css/index-tailwind-output.css
index bcc28e6b2..517f47b91 100644
--- a/css/index-tailwind-output.css
+++ b/css/index-tailwind-output.css
@@ -800,10 +800,6 @@ video {
margin: 2rem;
}
-.m-11 {
- margin: 2.75rem;
-}
-
.m-1 {
margin: 0.25rem;
}
@@ -812,6 +808,10 @@ video {
margin: 1.25rem;
}
+.m-4 {
+ margin: 1rem;
+}
+
.m-0\.5 {
margin: 0.125rem;
}
@@ -824,10 +824,6 @@ video {
margin: 0.75rem;
}
-.m-4 {
- margin: 1rem;
-}
-
.m-2 {
margin: 0.5rem;
}
@@ -968,6 +964,38 @@ video {
display: table;
}
+.table-caption {
+ display: table-caption;
+}
+
+.table-cell {
+ display: table-cell;
+}
+
+.table-column {
+ display: table-column;
+}
+
+.table-column-group {
+ display: table-column-group;
+}
+
+.table-footer-group {
+ display: table-footer-group;
+}
+
+.table-header-group {
+ display: table-header-group;
+}
+
+.table-row-group {
+ display: table-row-group;
+}
+
+.table-row {
+ display: table-row;
+}
+
.grid {
display: grid;
}
@@ -976,6 +1004,10 @@ video {
display: contents;
}
+.list-item {
+ display: list-item;
+}
+
.hidden {
display: none;
}
@@ -1080,6 +1112,10 @@ video {
width: 2.75rem;
}
+.w-6 {
+ width: 1.5rem;
+}
+
.w-16 {
width: 4rem;
}
@@ -1090,10 +1126,6 @@ video {
width: min-content;
}
-.w-6 {
- width: 1.5rem;
-}
-
.w-max {
width: -webkit-max-content;
width: -moz-max-content;
@@ -1240,6 +1272,10 @@ video {
overflow: hidden;
}
+.overflow-scroll {
+ overflow: scroll;
+}
+
.overflow-y-auto {
overflow-y: auto;
}
@@ -1565,6 +1601,10 @@ video {
text-transform: lowercase;
}
+.capitalize {
+ text-transform: capitalize;
+}
+
.italic {
font-style: italic;
}
@@ -1685,14 +1725,6 @@ video {
transition-duration: 150ms;
}
-.\!transition {
- transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter !important;
- transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter !important;
- transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter !important;
- transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1) !important;
- transition-duration: 150ms !important;
-}
-
.duration-500 {
transition-duration: 500ms;
}
From e461c2d4830ba26be9ec610db3a783b47fbfe2ce Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Fri, 14 Jan 2022 16:02:20 +0100
Subject: [PATCH 5/6] Translation sync
---
assets/themes/entrances/entrances.json | 12 ++++++++----
langs/layers/nl.json | 1 +
langs/themes/zh_Hant.json | 12 ++++++------
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/assets/themes/entrances/entrances.json b/assets/themes/entrances/entrances.json
index 50d619224..0767dc4a3 100644
--- a/assets/themes/entrances/entrances.json
+++ b/assets/themes/entrances/entrances.json
@@ -1,17 +1,21 @@
{
"id": "entrances",
"title": {
- "en": "Entrances"
+ "en": "Entrances",
+ "zh_Hant": "出入口"
},
"icon": "./assets/layers/entrance/door.svg",
"description": {
- "en": "A map showing all entrances, which surveys for important aspects for wheelchair users"
+ "en": "A map showing all entrances, which surveys for important aspects for wheelchair users",
+ "zh_Hant": "顯示所有出入口的地圖，勘查對輪椅使用者重要的資訊"
},
"shortDescription": {
- "en": "Survey entrances to help wheelchair routing"
+ "en": "Survey entrances to help wheelchair routing",
+ "zh_Hant": "幫助輪椅導航來勘查出入口"
},
"language": [
- "en"
+ "en",
+ "zh_Hant"
],
"version": "2021-12-04",
"maintainer": "MapComplete",
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 2bdbbee07..29f0bb2bf 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -586,6 +586,7 @@
}
},
"bike_repair_station": {
+ "description": "Deze laag toont fietspompen en herstelpunten voor fietsen",
"name": "Fietspunten (herstel, pomp of allebei)",
"presets": {
"0": {
diff --git a/langs/themes/zh_Hant.json b/langs/themes/zh_Hant.json
index de1192b08..69b33da56 100644
--- a/langs/themes/zh_Hant.json
+++ b/langs/themes/zh_Hant.json
@@ -299,6 +299,11 @@
"description": "在這份地圖上，公共可及的飲水點可以顯示出來，也能輕易的增加",
"title": "飲用水"
},
+ "entrances": {
+ "description": "顯示所有出入口的地圖，勘查對輪椅使用者重要的資訊",
+ "shortDescription": "幫助輪椅導航來勘查出入口",
+ "title": "出入口"
+ },
"etymology": {
"description": "在這份地圖，你可以看到物件是以何命名，道路、 建築等的命名由來連到 Wikidata。在跳出選單，你可以看到物件命名由來的維基條目 (如果有的話)，或是 Wikidata 框。如果物件本身有維基頁面，也會顯示。<br/><br/><b>你也可以貢獻！</b>放大到夠大的層級，然後<i>所有</i>道路都會顯示。你可以點選一個之後 Wikidata 搜尋框會跳出來。只要點幾下，你可以新增詞源連結。注意你要有開放街圖帳號才能這麼做。",
"layers": {
@@ -654,10 +659,5 @@
"description": "在這份地圖當中，你可以找到你附近的垃圾筒。如果地圖有遺漏垃圾筒，你可以自己加上去",
"shortDescription": "垃圾筒的地圖",
"title": "垃圾筒"
- },
- "entrances": {
- "description": "顯示所有出入口的地圖，勘查對輪椅使用者重要的資訊",
- "shortDescription": "幫助輪椅導航來勘查出入口",
- "title": "出入口"
}
-}
+}
\ No newline at end of file
From ccae8673538f27f2426dd63fa93ec1ac1e5cce78 Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Fri, 14 Jan 2022 16:02:49 +0100
Subject: [PATCH 6/6] Fix translations
---
langs/themes/nl.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index f1c1e93f2..19d39adf7 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -1042,10 +1042,10 @@
"title": "Surveillance under Surveillance"
},
"toerisme_vlaanderen": {
- "description": "Op deze kaart kan je info zien die relevant is voor toerisme, zoals:<br/><ul><li>Eetgelegenheden</li><li>Cafés en bars</li><li>(Fiets)oplaadpunten</li><li>Fietspompen, fietserverhuur en fietswinkels</li><li>Uitkijktorens</li><li>...</li></ul> Zie je fouten op de kaart? Dan kan je zelf makkelijk aanpasingen maken, die zichtbaar zijn voor iedereen. Hiervoor dien je een gratis OpenStreetMap account voor te maken.",
- "descriptionTail": "Met de steun van Toerisme Vlaanderen<img style='height:5rem; width: auto;' src='./assets/themes/toerisme_vlaanderen/logo.png' />",
+ "description": "<p class='mb-4'><i>Pin je punt</i> is een open toerismekaart waarin wandelaars en fietsers nuttige gegevens verzamelen die handig zijn voor andere wandelaars en fietsers.</p><p class='mb-4'>We verzamelen 7 thematische lagen: <ol><li>Laadpunten voor e-bikes</li><li>Openbare toiletten</li><li>Zit- en picknickbankjes</li><li>Uitkijkpunten, uitkijkplatformen en uitkijktorens</li><li>Fietsherstelpunten</li><li>Fietsverhuurpunten</li><li>Speeltuinen</li></ol><p>Klik op de exacte locatie op de kaart om een van deze 7 punten toe te voegen. Of corrigeer bestaande punten door erop te klikken.</p>",
+ "descriptionTail": "<p>Met de steun van Toerisme Vlaanderen</p><a href='https://www.toerismevlaanderen.be/pinjepunt'>Meer informatie op toerismevlaaneren.be</a><img style='height:5rem; width: auto;' src='./assets/themes/toerisme_vlaanderen/logo.png' />",
"shortDescription": "Een kaart om toeristisch relevante info op aan te duiden",
- "title": "Toeristisch relevante info"
+ "title": "Pin je punt"
},
"toilets": {
"description": "Een kaart met openbare toiletten",