From e7ae5973cbffef9296a7fb9702b7b9caa2fd6853 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Mon, 18 Jul 2022 15:28:58 +0200 Subject: [PATCH] Translation sync --- langs/layers/de.json | 4 +- langs/layers/en.json | 4 +- langs/layers/fr.json | 2 +- langs/layers/nl.json | 4 +- langs/themes/ca.json | 2 +- langs/themes/de.json | 18 ++++---- langs/themes/en.json | 18 ++++---- langs/themes/es.json | 16 +++---- langs/themes/fr.json | 18 ++++---- langs/themes/hu.json | 12 +++--- langs/themes/id.json | 2 +- langs/themes/it.json | 18 ++++---- langs/themes/ja.json | 14 +++--- langs/themes/nb_NO.json | 14 +++--- langs/themes/nl.json | 76 ++++++++++++++++----------------- langs/themes/ru.json | 2 +- langs/themes/zh_Hant.json | 2 +- scripts/generateTranslations.ts | 5 ++- 18 files changed, 117 insertions(+), 114 deletions(-) diff --git a/langs/layers/de.json b/langs/layers/de.json index d2928f18f..08c63e34f 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -444,7 +444,7 @@ "tagRenderings": { "9": { "renderings": { - "0": { + "rental-capacity-bicycle_type": { "question": "Wie viele type_plural können hier gemietet werden?", "render": "{capacity:bicycle_type} type_plural können hier gemietet werden" } @@ -3912,7 +3912,7 @@ "tagRenderings": { "6": { "renderings": { - "0": { + "hackerspaces-service-device-key": { "mappings": { "0": { "then": "In diesem Hackerspace gibt es {device-name}" diff --git a/langs/layers/en.json b/langs/layers/en.json index b7ba9d66c..067a64ae9 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -444,7 +444,7 @@ "tagRenderings": { "9": { "renderings": { - "0": { + "rental-capacity-bicycle_type": { "question": "How much type_plural can be rented here?", "render": "{capacity:bicycle_type} type_plural can be rented here" } @@ -3971,7 +3971,7 @@ "tagRenderings": { "6": { "renderings": { - "0": { + "hackerspaces-service-device-key": { "mappings": { "0": { "then": "There is {device-name} available at this hackerspace" diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 3ff5eb6e6..d0d1b598b 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -444,7 +444,7 @@ "tagRenderings": { "9": { "renderings": { - "0": { + "rental-capacity-bicycle_type": { "question": "Combien de type_plural peuvent être loués ici ?", "render": "{capacity:bicycle_type} type_plural peuvent être loués ici" } diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 62b17eec8..725c0cf76 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -444,7 +444,7 @@ "tagRenderings": { "9": { "renderings": { - "0": { + "rental-capacity-bicycle_type": { "question": "Hoeveel type_plural kunnen hier uitgeleend worden?", "render": "{capacity:bicycle_type} type_plural kunnen hier uitgeleend worden" } @@ -3859,7 +3859,7 @@ "tagRenderings": { "6": { "renderings": { - "0": { + "hackerspaces-service-device-key": { "mappings": { "0": { "then": "Er is {device-name} beschikbaar in deze hackerspace" diff --git a/langs/themes/ca.json b/langs/themes/ca.json index 724f5c12a..a1f4b1c15 100644 --- a/langs/themes/ca.json +++ b/langs/themes/ca.json @@ -114,7 +114,7 @@ "0": { "override": { "tagRenderings+": { - "1": { + "access": { "mappings": { "2": { "then": "Només clients" diff --git a/langs/themes/de.json b/langs/themes/de.json index 1e0a05e15..424226f3c 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -241,11 +241,11 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "operator": { "question": "Wer betreibt diesen Ort?", "render": "Dieser Ort wird betrieben von {operator}" }, - "1": { + "power_supply": { "mappings": { "0": { "then": "Dieser Ort hat eine Stromversorgung" @@ -273,7 +273,7 @@ "0": { "override": { "tagRenderings+": { - "0": { + "Access from containing feature": { "mappings": { "0": { "then": "Das enthaltende Objekt gibt an, dass es öffentlich zugänglich ist
{_embedding_feature:access:description}" @@ -289,7 +289,7 @@ } } }, - "1": { + "access": { "mappings": { "0": { "then": "Öffentlich zugänglich für jedermann" @@ -409,7 +409,11 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "future_cyclestreet": { + "question": "Wann wird diese Straße eine Fahrradstraße?", + "render": "Diese Straße wird am {cyclestreet:start_date} zu einer Fahrradstraße" + }, + "is_cyclestreet": { "mappings": { "0": { "then": "Diese Straße ist eine Fahrradstraße (mit einer Geschwindigkeitsbegrenzung von 30 km/h)" @@ -425,10 +429,6 @@ } }, "question": "Ist die Straße {name} eine Fahrradstraße?" - }, - "1": { - "question": "Wann wird diese Straße eine Fahrradstraße?", - "render": "Diese Straße wird am {cyclestreet:start_date} zu einer Fahrradstraße" } } }, diff --git a/langs/themes/en.json b/langs/themes/en.json index 2807ac718..591e4dc8f 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -241,11 +241,11 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "operator": { "question": "Who operates this place?", "render": "This place is operated by {operator}" }, - "1": { + "power_supply": { "mappings": { "0": { "then": "This place has a power supply" @@ -273,7 +273,7 @@ "0": { "override": { "tagRenderings+": { - "0": { + "Access from containing feature": { "mappings": { "0": { "then": "The containing feature states that this is publicly accessible
{_embedding_feature:access:description}" @@ -289,7 +289,7 @@ } } }, - "1": { + "access": { "mappings": { "0": { "then": "Publicly accessible to anyone" @@ -409,7 +409,11 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "future_cyclestreet": { + "question": "When will this street become a cyclestreet?", + "render": "This street will become a cyclestreet at {cyclestreet:start_date}" + }, + "is_cyclestreet": { "mappings": { "0": { "then": "This street is a cyclestreet (and has a speed limit of 30 km/h)" @@ -425,10 +429,6 @@ } }, "question": "Is the street {name} a cyclestreet?" - }, - "1": { - "question": "When will this street become a cyclestreet?", - "render": "This street will become a cyclestreet at {cyclestreet:start_date}" } } }, diff --git a/langs/themes/es.json b/langs/themes/es.json index 0370b19ab..87c1bc13f 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -162,11 +162,11 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "operator": { "question": "¿Quién opera este lugar?", "render": "Este lugar lo opera {operator}" }, - "1": { + "power_supply": { "mappings": { "0": { "then": "Este lugar tiene suministro eléctrico" @@ -192,7 +192,7 @@ "0": { "override": { "tagRenderings+": { - "1": { + "access": { "mappings": { "0": { "then": "Accesible públicamente a cualquiera" @@ -311,7 +311,11 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "future_cyclestreet": { + "question": "¿Cuándo se convertirá esta calle en una ciclocalle?", + "render": "Esta calle se convetirá en una ciclocalle el {cyclestreet:start_date}" + }, + "is_cyclestreet": { "mappings": { "0": { "then": "Esta calle es una ciclocalle (y tiene un límite de velocidad de 30km/h)" @@ -327,10 +331,6 @@ } }, "question": "¿La calle {name} es una ciclocalle?" - }, - "1": { - "question": "¿Cuándo se convertirá esta calle en una ciclocalle?", - "render": "Esta calle se convetirá en una ciclocalle el {cyclestreet:start_date}" } } }, diff --git a/langs/themes/fr.json b/langs/themes/fr.json index a38c30ad6..241c068d4 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -241,11 +241,11 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "operator": { "question": "Qui est l’exploitant du site ?", "render": "Ce site est exploité par {operator}" }, - "1": { + "power_supply": { "mappings": { "0": { "then": "Ce site a une source d’alimentation" @@ -273,7 +273,7 @@ "0": { "override": { "tagRenderings+": { - "0": { + "Access from containing feature": { "mappings": { "0": { "then": "L’élément englobant indique un accès libre
{_embedding_feature:access:description}" @@ -289,7 +289,7 @@ } } }, - "1": { + "access": { "mappings": { "0": { "then": "Libre d’accès" @@ -409,7 +409,11 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "future_cyclestreet": { + "question": "Quand cette rue deviendra-t-elle cyclable ?", + "render": "Cette rue deviendra une rue cyclable le {cyclestreet:start_date}" + }, + "is_cyclestreet": { "mappings": { "0": { "then": "Cette rue est une rue cyclable (et est limitée à 30 km/h)" @@ -425,10 +429,6 @@ } }, "question": "La rue {name} est-elle une rue cyclable ?" - }, - "1": { - "question": "Quand cette rue deviendra-t-elle cyclable ?", - "render": "Cette rue deviendra une rue cyclable le {cyclestreet:start_date}" } } }, diff --git a/langs/themes/hu.json b/langs/themes/hu.json index fdac6ab31..e79c7661f 100644 --- a/langs/themes/hu.json +++ b/langs/themes/hu.json @@ -77,7 +77,7 @@ }, "overrideAll": { "tagRenderings+": { - "1": { + "power_supply": { "question": "Van-e itt elektromos áram?" } } @@ -129,7 +129,11 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "future_cyclestreet": { + "question": "Mikor lesz ez az utca kerékpárosutca?", + "render": "Ez az utca ekkor lesz kerékpárosutca: {cyclestreet:start_date}" + }, + "is_cyclestreet": { "mappings": { "0": { "then": "Ez az utca kerékpárosutca (és 30 km/h a sebességkorlátozás)" @@ -145,10 +149,6 @@ } }, "question": "Kerékpárosutca-e {name}?" - }, - "1": { - "question": "Mikor lesz ez az utca kerékpárosutca?", - "render": "Ez az utca ekkor lesz kerékpárosutca: {cyclestreet:start_date}" } } }, diff --git a/langs/themes/id.json b/langs/themes/id.json index addb20850..b811583fd 100644 --- a/langs/themes/id.json +++ b/langs/themes/id.json @@ -92,7 +92,7 @@ }, "overrideAll": { "tagRenderings+": { - "1": { + "power_supply": { "mappings": { "0": { "then": "Tempat ini memiliki catu daya" diff --git a/langs/themes/it.json b/langs/themes/it.json index fbed99743..ca2191a00 100644 --- a/langs/themes/it.json +++ b/langs/themes/it.json @@ -235,11 +235,11 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "operator": { "question": "Chi gestisce questo luogo?", "render": "Questo luogo è gestito da {operator}" }, - "1": { + "power_supply": { "mappings": { "0": { "then": "Questo luogo fornisce corrente elettrica" @@ -267,7 +267,7 @@ "0": { "override": { "tagRenderings+": { - "0": { + "Access from containing feature": { "mappings": { "0": { "then": "L’ elemento in cui è contenuto indica che è pubblicamente accessibile
{_embedding_feature:access:description}" @@ -283,7 +283,7 @@ } } }, - "1": { + "access": { "mappings": { "0": { "then": "Pubblicamente accessibile a chiunque" @@ -356,7 +356,11 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "future_cyclestreet": { + "question": "Questa strada diventerà una strada ciclabile quando?", + "render": "Questa strada diventerà una strada ciclabile dal {cyclestreet:start_date}" + }, + "is_cyclestreet": { "mappings": { "0": { "then": "Questa è una strada ciclabile (e ha un limite di velocità massima di 30 km/h)" @@ -372,10 +376,6 @@ } }, "question": "È {name} una strada ciclabile?" - }, - "1": { - "question": "Questa strada diventerà una strada ciclabile quando?", - "render": "Questa strada diventerà una strada ciclabile dal {cyclestreet:start_date}" } } }, diff --git a/langs/themes/ja.json b/langs/themes/ja.json index fc80489e4..9a49e6944 100644 --- a/langs/themes/ja.json +++ b/langs/themes/ja.json @@ -227,11 +227,11 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "operator": { "question": "この店は誰が経営しているんですか?", "render": "この場所は{operator}によって運営されます" }, - "1": { + "power_supply": { "mappings": { "0": { "then": "この場所には電源があります" @@ -286,7 +286,11 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "future_cyclestreet": { + "question": "この通りはいつcyclestreetになるんですか?", + "render": "この通りは{cyclestreet:start_date}に、cyclestreetになります" + }, + "is_cyclestreet": { "mappings": { "0": { "then": "cyclestreet(最高速度は30km/h)" @@ -301,10 +305,6 @@ "then": "この通りはcyclestreetではない" } } - }, - "1": { - "question": "この通りはいつcyclestreetになるんですか?", - "render": "この通りは{cyclestreet:start_date}に、cyclestreetになります" } } }, diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json index 496bf9d0e..677894e52 100644 --- a/langs/themes/nb_NO.json +++ b/langs/themes/nb_NO.json @@ -142,7 +142,7 @@ }, "overrideAll": { "tagRenderings+": { - "1": { + "power_supply": { "mappings": { "0": { "then": "Dette stedet har strømforsyning" @@ -167,7 +167,7 @@ "0": { "override": { "tagRenderings+": { - "1": { + "access": { "mappings": { "0": { "then": "Offentlig tilgjengelig for alle" @@ -252,7 +252,11 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "future_cyclestreet": { + "question": "Når vil denne gaten bli en sykkelgate?", + "render": "Denne gaten vil bli en sykkelgate {cyclestreet:start_date}" + }, + "is_cyclestreet": { "mappings": { "0": { "then": "Denne gaten er en sykkelvei (og har en fartsgrense på 30 km/t)" @@ -268,10 +272,6 @@ } }, "question": "Er {name}-gaten en sykkelgate?" - }, - "1": { - "question": "Når vil denne gaten bli en sykkelgate?", - "render": "Denne gaten vil bli en sykkelgate {cyclestreet:start_date}" } } }, diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 83b6c7961..b51b5cd3e 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -104,7 +104,7 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "Access tag": { "mappings": { "0": { "then": "Dit gebied is vrij toegankelijk" @@ -131,7 +131,26 @@ "question": "Is dit gebied toegankelijk?", "render": "De toegankelijkheid van dit gebied is: {access:description}" }, - "1": { + "Editable description": { + "render": "Extra info via buurtnatuur.be: {description:0}" + }, + "Name tag": { + "mappings": { + "0": { + "then": "Dit gebied heeft geen naam" + } + }, + "question": "Wat is de naam van dit gebied?", + "render": "Dit gebied heet {name}" + }, + "Name:nl-tag": { + "question": "Wat is de Nederlandstalige naam van dit gebied?", + "render": "Dit gebied heet {name:nl}" + }, + "Non-editable description": { + "render": "Extra info: {description}" + }, + "Operator tag": { "mappings": { "1": { "then": "Dit gebied wordt beheerd door Natuurpunt" @@ -145,25 +164,6 @@ }, "question": "Wie beheert dit gebied?", "render": "Beheer door {operator}" - }, - "2": { - "render": "Extra info: {description}" - }, - "3": { - "render": "Extra info via buurtnatuur.be: {description:0}" - }, - "4": { - "question": "Wat is de Nederlandstalige naam van dit gebied?", - "render": "Dit gebied heet {name:nl}" - }, - "5": { - "mappings": { - "0": { - "then": "Dit gebied heeft geen naam" - } - }, - "question": "Wat is de naam van dit gebied?", - "render": "Dit gebied heet {name}" } } }, @@ -381,11 +381,11 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "operator": { "question": "Wie beheert deze plaats?", "render": "Deze plaats wordt beheerd door {operator}" }, - "1": { + "power_supply": { "mappings": { "0": { "then": "Deze plaats heeft stroomvoorziening" @@ -413,7 +413,7 @@ "0": { "override": { "tagRenderings+": { - "0": { + "Access from containing feature": { "mappings": { "0": { "then": "Een omvattend element geeft aan dat dit publiek toegangkelijk is
{_embedding_feature:access:description}" @@ -429,7 +429,7 @@ } } }, - "1": { + "access": { "mappings": { "0": { "then": "Voor iedereen publiek toegankelijk" @@ -549,7 +549,11 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "future_cyclestreet": { + "question": "Wanneer wordt deze straat een fietsstraat?", + "render": "Deze straat wordt fietsstraat op {cyclestreet:start_date}" + }, + "is_cyclestreet": { "mappings": { "0": { "then": "Deze straat is een fietsstraat (en dus zone 30)" @@ -565,10 +569,6 @@ } }, "question": "Is de straat {name} een fietsstraat?" - }, - "1": { - "question": "Wanneer wordt deze straat een fietsstraat?", - "render": "Deze straat wordt fietsstraat op {cyclestreet:start_date}" } } }, @@ -832,14 +832,7 @@ "5": { "override": { "tagRenderings+": { - "0": { - "mappings": { - "0": { - "then": "Geen omliggend OSM-gebouw gevonden" - } - } - }, - "3": { + "import-button": { "mappings": { "0": { "then": "Geen omliggend OSM-gebouw gevonden. Een omliggend gebouw is nodig om dit punt als adres punt toe te voegen.
Importeer eerst de gebouwen. Vernieuw dan de pagina om losse adressen toe te voegen
" @@ -850,6 +843,13 @@ "text": "Voeg dit adres als een nieuw adrespunt toe" } } + }, + "render_embedded": { + "mappings": { + "0": { + "then": "Geen omliggend OSM-gebouw gevonden" + } + } } } } diff --git a/langs/themes/ru.json b/langs/themes/ru.json index edb9275b2..c77de32cd 100644 --- a/langs/themes/ru.json +++ b/langs/themes/ru.json @@ -231,7 +231,7 @@ "0": { "override": { "tagRenderings+": { - "1": { + "access": { "mappings": { "3": { "then": "Только членам клуба" diff --git a/langs/themes/zh_Hant.json b/langs/themes/zh_Hant.json index a87f75a98..31a06fd77 100644 --- a/langs/themes/zh_Hant.json +++ b/langs/themes/zh_Hant.json @@ -235,7 +235,7 @@ }, "overrideAll": { "tagRenderings+": { - "0": { + "operator": { "question": "這個地方是誰營運的？", "render": "這個地方由 {operator} 營運的" } diff --git a/scripts/generateTranslations.ts b/scripts/generateTranslations.ts index 0b640e00f..c97ba9de5 100644 --- a/scripts/generateTranslations.ts +++ b/scripts/generateTranslations.ts @@ -63,6 +63,9 @@ class TranslationPart { } recursiveAdd(object: any, context: string) { + if(context.startsWith("./assets/themes/onwheels")){ + console.log("Hello world") + } const isProbablyTranslationObject = knownLanguages.some(l => object.hasOwnProperty(l)); if (isProbablyTranslationObject) { this.addTranslationObject(object, context) @@ -101,7 +104,7 @@ class TranslationPart { continue } - if (v["id"] !== undefined && context.endsWith("tagRenderings")) { + if (v["id"] !== undefined && context.indexOf("tagRenderings")>=0) { // We use the embedded id as key instead of the index as this is more stable // Note: indonesian is shortened as 'id' as well! if (v["en"] !== undefined || v["nl"] !== undefined) {