From b9ff8667a91f3f6c34e924a8a26bdd688bd8bcd7 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Wed, 16 Feb 2022 22:18:58 +0100 Subject: [PATCH] Fix last untranslated strings, make these errors again --- Models/ThemeConfig/Conversion/Validation.ts | 7 +++-- assets/layers/birdhide/birdhide.json | 28 +++++++++++++++++-- .../layers/nature_reserve/nature_reserve.json | 3 +- assets/layers/parking/parking.json | 1 + assets/themes/parkings/parkings.json | 1 - 5 files changed, 33 insertions(+), 7 deletions(-) diff --git a/Models/ThemeConfig/Conversion/Validation.ts b/Models/ThemeConfig/Conversion/Validation.ts index 79f328f39d..6837c5f387 100644 --- a/Models/ThemeConfig/Conversion/Validation.ts +++ b/Models/ThemeConfig/Conversion/Validation.ts @@ -30,7 +30,7 @@ class ValidateLanguageCompleteness extends DesugaringStep { translations .filter(t => t.tr.translations[neededLanguage] === undefined && t.tr.translations["*"] === undefined) .forEach(missing => { - errors.push(context + "A theme should be translation-complete for " + neededLanguage + ", but it lacks a translation for " + missing.context + ".\n\tThe english translation is " + missing.tr.textFor('en')) + errors.push(context + "A theme should be translation-complete for " + neededLanguage + ", but it lacks a translation for " + missing.context + ".\n\tThe known translation is " + missing.tr.textFor('en')) }) } @@ -138,10 +138,11 @@ class ValidateTheme extends DesugaringStep { .convert(theme, theme.id) errors.push(...checked.errors) } - if(!json.hideFromOverview){ + if(!json.hideFromOverview && theme.id !== "personal"){ + // Official, public themes must have a full english translation const checked = new ValidateLanguageCompleteness("en") .convert(theme, theme.id) - warnings.push(...checked.errors) + errors.push(...checked.errors) } } catch (e) { diff --git a/assets/layers/birdhide/birdhide.json b/assets/layers/birdhide/birdhide.json index 2f676c6369..e6d1990245 100644 --- a/assets/layers/birdhide/birdhide.json +++ b/assets/layers/birdhide/birdhide.json @@ -1,6 +1,7 @@ { "id": "birdhide", "name": { + "en": "Bird watching places", "nl": "Vogelkijkhutten" }, "minzoom": 14, @@ -13,17 +14,18 @@ }, "title": { "render": { + "en": "Bird watching place", "nl": "Vogelkijkplaats" }, "mappings": [ { "if": { "and": [ - "name~((V|v)ogel.*).*" + "name~(((V|v)ogel)|(B|b)ird).*" ] }, "then": { - "nl": "{name}" + "*": "{name}" } }, { @@ -39,6 +41,7 @@ ] }, "then": { + "en": "Bird hide {name}", "nl": "Vogelkijkhut {name}" } }, @@ -49,12 +52,14 @@ ] }, "then": { + "en": "Bird blind {name}", "nl": "Vogelkijkwand {name}" } } ] }, "description": { + "en": "A birdhide", "nl": "Een vogelkijkhut" }, "tagRenderings": [ @@ -62,6 +67,7 @@ { "id": "bird-hide-shelter-or-wall", "question": { + "en": "Is this a bird blind or a bird watching shelter?", "nl": "Is dit een kijkwand of kijkhut?" }, "mappings": [ @@ -74,6 +80,7 @@ ] }, "then": { + "en": "Bird blind", "nl": "Vogelkijkwand" } }, @@ -86,6 +93,7 @@ ] }, "then": { + "en": "Bird hide", "nl": "Vogelkijkhut" } }, @@ -97,6 +105,7 @@ ] }, "then": { + "en": "Bird tower hide", "nl": "Vogelkijktoren" } }, @@ -109,6 +118,7 @@ ] }, "then": { + "en": "Bird hide shelter", "nl": "Vogelkijkhut" }, "hideInAnswer": true @@ -118,6 +128,7 @@ { "id": "bird-hide-wheelchair", "question": { + "en": "Is this bird hide accessible to wheelchair users?", "nl": "Is deze vogelkijkplaats rolstoeltoegankelijk?" }, "mappings": [ @@ -128,6 +139,7 @@ ] }, "then": { + "en": "There are special provisions for wheelchair users", "nl": "Er zijn speciale voorzieningen voor rolstoelen" } }, @@ -138,6 +150,7 @@ ] }, "then": { + "en": "A wheelchair can easily use this birdhide", "nl": "Een rolstoel raakt er vlot" } }, @@ -148,6 +161,7 @@ ] }, "then": { + "en": "This birdhide is reachable by wheelchair, but it is not easy", "nl": "Je kan er raken met een rolstoel, maar het is niet makkelijk" } }, @@ -158,6 +172,7 @@ ] }, "then": { + "en": "Not accessible to wheelchair users", "nl": "Niet rolstoeltoegankelijk" } } @@ -165,24 +180,28 @@ }, { "render": { + "en": "Operated by {operator}", "nl": "Beheer door {operator}" }, "freeform": { "key": "operator" }, "question": { + "en": "Who operates this birdhide?", "nl": "Wie beheert deze vogelkijkplaats?" }, "mappings": [ { "if": "operator=Natuurpunt", "then": { + "en": "Operated by Natuurpunt", "nl": "Beheer door Natuurpunt" } }, { "if": "operator=Agentschap Natuur en Bos", "then": { + "en": "Operated by the Agency for Nature and Forests", "nl": "Beheer door het Agentschap Natuur en Bos " } } @@ -213,9 +232,11 @@ "amenity=shelter" ], "title": { + "en": "Birdhide", "nl": "vogelkijkhut" }, "description": { + "en": "A covered shelter where one can watch birds comfortably", "nl": "Een overdekte hut waarbinnen er warm en droog naar vogels gekeken kan worden" } }, @@ -226,9 +247,11 @@ "shelter=no" ], "title": { + "en": "Bird blind", "nl": "vogelkijkwand" }, "description": { + "en": "A screen or wall with openings to watch birds", "nl": "Een vogelkijkwand waarachter men kan staan om vogels te kijken" } } @@ -259,6 +282,7 @@ "options": [ { "question": { + "en": "Only covered birdhides", "nl": "Enkel overdekte kijkhutten" }, "osmTags": { diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json index 34369249fe..33c3b41f21 100644 --- a/assets/layers/nature_reserve/nature_reserve.json +++ b/assets/layers/nature_reserve/nature_reserve.json @@ -1,6 +1,7 @@ { "id": "nature_reserve", "name": { + "en": "Nature reserve", "nl": "Natuurgebied" }, "minzoom": 12, @@ -34,7 +35,7 @@ ] }, "then": { - "nl": "{name}" + "*": "{name}" } } ] diff --git a/assets/layers/parking/parking.json b/assets/layers/parking/parking.json index 8e7764b35e..1d3a5bf919 100644 --- a/assets/layers/parking/parking.json +++ b/assets/layers/parking/parking.json @@ -1,6 +1,7 @@ { "id": "parking", "name": { + "en": "Parking", "nl": "Parking" }, "minzoom": 12, diff --git a/assets/themes/parkings/parkings.json b/assets/themes/parkings/parkings.json index 933e446b3e..34b8293cce 100644 --- a/assets/themes/parkings/parkings.json +++ b/assets/themes/parkings/parkings.json @@ -37,7 +37,6 @@ "startLon": 3.22435, "startZoom": 12, "widenFactor": 1.2, - "socialImage": "", "layers": [ "parking" ]