diff --git a/assets/themes/cyclestreets/Finland_road_sign_E28.svg b/assets/themes/cyclestreets/Finland_road_sign_E28.svg
new file mode 100644
index 000000000..91f5fac5a
--- /dev/null
+++ b/assets/themes/cyclestreets/Finland_road_sign_E28.svg
@@ -0,0 +1,146 @@
+
+
+
+
diff --git a/assets/themes/cyclestreets/Zeichen_244.svg b/assets/themes/cyclestreets/Zeichen_244.svg
new file mode 100644
index 000000000..8105b9795
--- /dev/null
+++ b/assets/themes/cyclestreets/Zeichen_244.svg
@@ -0,0 +1,38 @@
+
+
\ No newline at end of file
diff --git a/assets/themes/cyclestreets/Zusatzzeichen_1020-30.svg b/assets/themes/cyclestreets/Zusatzzeichen_1020-30.svg
new file mode 100644
index 000000000..92f66ed3b
--- /dev/null
+++ b/assets/themes/cyclestreets/Zusatzzeichen_1020-30.svg
@@ -0,0 +1,35 @@
+
+
\ No newline at end of file
diff --git a/assets/themes/cyclestreets/Zusatzzeichen_1022-12.svg b/assets/themes/cyclestreets/Zusatzzeichen_1022-12.svg
new file mode 100644
index 000000000..7d5f985fa
--- /dev/null
+++ b/assets/themes/cyclestreets/Zusatzzeichen_1022-12.svg
@@ -0,0 +1,44 @@
+
+
\ No newline at end of file
diff --git a/assets/themes/cyclestreets/Zusatzzeichen_1024-10.svg b/assets/themes/cyclestreets/Zusatzzeichen_1024-10.svg
new file mode 100644
index 000000000..9d12fb149
--- /dev/null
+++ b/assets/themes/cyclestreets/Zusatzzeichen_1024-10.svg
@@ -0,0 +1,38 @@
+
+
\ No newline at end of file
diff --git a/assets/themes/cyclestreets/Zusatzzeichen_KFZ_frei.svg b/assets/themes/cyclestreets/Zusatzzeichen_KFZ_frei.svg
new file mode 100644
index 000000000..01c4a9f6c
--- /dev/null
+++ b/assets/themes/cyclestreets/Zusatzzeichen_KFZ_frei.svg
@@ -0,0 +1,133 @@
+
+
+
+
diff --git a/assets/themes/cyclestreets/cyclestreets.json b/assets/themes/cyclestreets/cyclestreets.json
index 0cddb4e0f..f085add13 100644
--- a/assets/themes/cyclestreets/cyclestreets.json
+++ b/assets/themes/cyclestreets/cyclestreets.json
@@ -50,7 +50,7 @@
},
"layers": [
{
- "id": "fietsstraat",
+ "id": "cyclestreets",
"name": {
"nl": "Fietsstraten",
"en": "Cyclestreets",
@@ -68,8 +68,9 @@
"minzoom": 7,
"source": {
"osmTags": {
- "and": [
- "cyclestreet=yes"
+ "or": [
+ "cyclestreet=yes",
+ "bicycle_road=yes"
]
}
},
@@ -90,9 +91,21 @@
],
"mapRendering": [
{
- "icon": "./assets/themes/cyclestreets/F111.svg",
+ "icon": {
+ "render": "./assets/themes/cyclestreets/F111.svg",
+ "mappings": [
+ {
+ "if": "_country=de",
+ "then": "./assets/themes/cyclestreets/Zeichen_244.svg"
+ },
+ {
+ "if": "_country=fi",
+ "then": "./assets/themes/cyclestreets/Finland_road_sign_E28.svg"
+ }
+ ]
+ },
"location": [
- "point"
+ "projected_centerpoint"
]
},
{
@@ -129,7 +142,12 @@
},
"minzoom": 9,
"source": {
- "osmTags": "proposed:cyclestreet=yes"
+ "osmTags": {
+ "or": [
+ "proposed:cyclestreet=yes",
+ "proposed:bicycle_road=yes"
+ ]
+ }
},
"title": {
"render": {
@@ -168,7 +186,7 @@
{
"icon": "./assets/themes/cyclestreets/F113.svg",
"location": [
- "point"
+ "projected_centerpoint"
]
},
{
@@ -243,7 +261,7 @@
{
"icon": "./assets/svg/pencil.svg",
"location": [
- "point"
+ "projected_centerpoint"
]
},
{
@@ -252,11 +270,21 @@
"mappings": [
{
"then": "#0000ff",
- "if": "cyclestreet=yes"
+ "if": {
+ "or": [
+ "cyclestreet=yes",
+ "bicycle_road=yes"
+ ]
+ }
},
{
"then": "#09f9dd",
- "if": "proposed:cyclestreet=yes"
+ "if": {
+ "or": [
+ "proposed:cyclestreet=yes",
+ "proposed:bicycle_road=yes"
+ ]
+ }
}
]
},
@@ -303,6 +331,30 @@
},
"hideInAnswer": "_country!=be"
},
+ {
+ "if": "bicycle_road=yes",
+ "then": {
+ "en": "This street is a bicycle road"
+ },
+ "hideInAnswer": true
+ },
+ {
+ "if": {
+ "and": [
+ "bicycle_road=yes",
+ "proposed:bicycle_road=",
+ "maxspeed=30",
+ "source:maxspeed=DE:bicycle_road",
+ "vehicle=no",
+ "bicycle=designated",
+ "traffic_sign=DE:244.1"
+ ]
+ },
+ "then": {
+ "en": "This street is a bicycle road (has a speed limit of 30 km/h and vehicles are not allowed) (supplementary signs will be asked later)"
+ },
+ "hideInAnswer": "_country!=de"
+ },
{
"if": {
"and": [
@@ -322,7 +374,12 @@
"fr": "Cette rue est une rue cyclable",
"ca": "Aquest carrer és una ciclocarrer"
},
- "hideInAnswer": "_country=be"
+ "hideInAnswer": {
+ "or": [
+ "_country=be",
+ "_country=de"
+ ]
+ }
},
{
"if": {
@@ -342,13 +399,28 @@
"es": "Esta calle se convertirá en una ciclocalle próximamente",
"fr": "Cette rue sera bientôt une rue cyclable",
"ca": "Aquest carrer es convertirà en un ciclocarrer pròximament"
- }
+ },
+ "hideInAnswer": "_country=de"
+ },
+ {
+ "if": {
+ "and": [
+ "bicycle_road=",
+ "proposed:bicycle_road=yes"
+ ]
+ },
+ "then": {
+ "en": "This street will become a bicycle road soon"
+ },
+ "hideInAnswer": "_country!=de"
},
{
"if": {
"and": [
"cyclestreet=",
"proposed:cyclestreet=",
+ "bicycle_road=",
+ "proposed:bicycle_road=",
"overtaking:motor_vehicle="
]
},
@@ -366,6 +438,75 @@
}
]
},
+ {
+ "id": "supplementary_sign",
+ "condition": {
+ "and": [
+ "bicycle_road=yes",
+ "_country=de"
+ ]
+ },
+ "question": {
+ "en": "What supplementary signs does this bicycle road have?"
+ },
+ "mappings": [
+ {
+ "if": "traffic_sign=DE:244.1,1020-30",
+ "then": {
+ "en": "Residents allowed",
+ "de": "Anlieger frei"
+ },
+ "icon": {
+ "path": "./assets/themes/cyclestreets/Zusatzzeichen_1020-30.svg",
+ "class": "medium"
+ },
+ "addExtraTags": [
+ "vehicle=destination"
+ ]
+ },
+ {
+ "if": "traffic_sign=DE:244.1,1020-30,1024-10;1022-12",
+ "then": {
+ "en": "Motor vehicles allowed",
+ "de": "KFZ frei"
+ },
+ "icon": {
+ "path": "./assets/themes/cyclestreets/Zusatzzeichen_KFZ_frei.svg",
+ "class": "medium"
+ },
+ "addExtraTags": [
+ "motor_vehicle=yes"
+ ]
+ },
+ {
+ "if": "traffic_sign=DE:244.1,1022-12",
+ "then": {
+ "en": "Motorcycles allowed",
+ "de": "Motorräder frei"
+ },
+ "icon": {
+ "path": "./assets/themes/cyclestreets/Zusatzzeichen_1022-12.svg",
+ "class": "medium"
+ },
+ "addExtraTags": [
+ "motorcycle=yes"
+ ]
+ },
+ {
+ "if": "traffic_sign=DE:244.1,1024-10",
+ "then": {
+ "en": "Cars allowed"
+ },
+ "icon": {
+ "path": "./assets/themes/cyclestreets/Zusatzzeichen_1024-10.svg",
+ "class": "medium"
+ },
+ "addExtraTags": [
+ "motorcar=yes"
+ ]
+ }
+ ]
+ },
{
"id": "future_cyclestreet",
"question": {
diff --git a/assets/themes/cyclestreets/license_info.json b/assets/themes/cyclestreets/license_info.json
index 31e3198f5..2a74b036a 100644
--- a/assets/themes/cyclestreets/license_info.json
+++ b/assets/themes/cyclestreets/license_info.json
@@ -19,6 +19,66 @@
"https://commons.wikimedia.org/wiki/File:Belgian_road_sign_F113_nl.svg"
]
},
+ {
+ "path": "Finland_road_sign_E28.svg",
+ "license": "CC0",
+ "authors": [
+ "Suomen tasavalta"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Finland_road_sign_E28.svg"
+ ]
+ },
+ {
+ "path": "Zeichen_244.svg",
+ "license": "CC0",
+ "authors": [
+ "Bundesministerium für Verkehr, Bau- und Wohnungswesen"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Zeichen_244_-_Beginn_der_Fahrradstraße,_StVO_1997.svg"
+ ]
+ },
+ {
+ "path": "Zusatzzeichen_1020-30.svg",
+ "license": "CC0",
+ "authors": [
+ "Bundesministerium für Verkehr, Bau- und Wohnungswesen"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Zusatzzeichen_1020-30_-_Anlieger_frei_(600x330),_StVO_1992.svg"
+ ]
+ },
+ {
+ "path": "Zusatzzeichen_1022-12.svg",
+ "license": "CC0",
+ "authors": [
+ "Bundesministerium für Verkehr, Bau- und Wohnungswesen"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Zusatzzeichen_1022-12_-_Krafträder_auch_mit_Beiwagen,_Kleinkrafträder_und_Mofas_frei_(600x450),_StVO_1992.svg"
+ ]
+ },
+ {
+ "path": "Zusatzzeichen_1024-10.svg",
+ "license": "CC0",
+ "authors": [
+ "Bundesministerium für Verkehr, Bau- und Wohnungswesen"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Zusatzzeichen_1024-10_-_Personenkraftwagen_frei,_StVO_1992.svg"
+ ]
+ },
+ {
+ "path": "Zusatzzeichen_KFZ_frei.svg",
+ "license": "CC0",
+ "authors": [
+ "Bundesministerium für Verkehr, Bau- und Wohnungswesen"
+ ],
+ "sources": [
+ "https://wiki.openstreetmap.org/wiki/File:Zusatzzeichen_KFZ_frei.svg"
+ ]
+ },
{
"path": "logo.svg",
"license": "CC0",
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 41ef55fb2..102c5b3e2 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -1,19 +1,13 @@
{
"id": "mapcomplete-changes",
"title": {
- "en": "Changes made with MapComplete",
- "de": "Mit MapComplete vorgenommene Änderungen",
- "fr": "Changements faits avec MapComplete"
+ "en": "Changes made with MapComplete"
},
"shortDescription": {
- "en": "Shows changes made by MapComplete",
- "de": "Zeigt die mit MapComplete vorgenommenen Änderungen",
- "fr": "Montrer les changements faits avec MapComplete"
+ "en": "Shows changes made by MapComplete"
},
"description": {
- "en": "This maps shows all the changes made with MapComplete",
- "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen",
- "fr": "Cette carte affiche toutes les modifications réalisées avec MapComplete"
+ "en": "This maps shows all the changes made with MapComplete"
},
"maintainer": "",
"icon": "./assets/svg/logo.svg",
@@ -28,9 +22,7 @@
{
"id": "mapcomplete-changes",
"name": {
- "en": "Changeset centers",
- "de": "Zentrum der Änderungssätze",
- "fr": "Centre du groupe de modifications"
+ "en": "Changeset centers"
},
"minzoom": 0,
"source": {
@@ -44,47 +36,35 @@
],
"title": {
"render": {
- "en": "Changeset for {theme}",
- "de": "Änderungssatz für {theme}",
- "fr": "Groupe de modifications pour {theme}"
+ "en": "Changeset for {theme}"
}
},
"description": {
- "en": "Shows all MapComplete changes",
- "de": "Zeigt alle MapComplete Änderungen",
- "fr": "Afficher toutes les modifications MapComplete"
+ "en": "Shows all MapComplete changes"
},
"tagRenderings": [
{
"id": "render_id",
"render": {
- "en": "Changeset {id}",
- "de": "Änderungssatz {id}",
- "fr": "Groupe de modifications {id}"
+ "en": "Changeset {id}"
}
},
{
"id": "contributor",
"render": {
- "en": "Change made by {_last_edit:contributor}",
- "de": "Geändert von {_last_edit:contributor}",
- "fr": "Modification faite par {_last_edit:contributor}"
+ "en": "Change made by {_last_edit:contributor}"
}
},
{
"id": "theme",
"render": {
- "en": "Change with theme {theme}",
- "de": "Änderung mit Thema {theme}",
- "fr": "Modification avec le thème {theme}"
+ "en": "Change with theme {theme}"
},
"mappings": [
{
"if": "theme~http.*",
"then": {
- "en": "Change with unofficial theme {theme}",
- "de": "Änderung mit inoffiziellem Thema {theme}",
- "fr": "Modification avec le thème non-officiel {theme}"
+ "en": "Change with unofficial theme {theme}"
}
}
]
@@ -388,9 +368,7 @@
}
],
"question": {
- "en": "Themename contains {search}",
- "de": "Themenname enthält {search}",
- "fr": "Nom de thème contenant {search}"
+ "en": "Themename contains {search}"
}
}
]
@@ -406,9 +384,7 @@
}
],
"question": {
- "en": "Made by contributor {search}",
- "de": "Erstellt von {search}",
- "fr": "Réalisé par {search}"
+ "en": "Made by contributor {search}"
}
}
]
@@ -424,9 +400,7 @@
}
],
"question": {
- "en": "Not made by contributor {search}",
- "de": "Nicht erstellt von {search}",
- "fr": "Non réalisé par {search}"
+ "en": "Not made by contributor {search}"
}
}
]
@@ -441,9 +415,7 @@
{
"id": "link_to_more",
"render": {
- "en": "More statistics can be found here",
- "de": "Weitere Statistiken finden Sie hier",
- "fr": "D’autres statistiques sont disponibles ici"
+ "en": "More statistics can be found here"
}
},
{
diff --git a/langs/themes/ca.json b/langs/themes/ca.json
index 5d76fd9dc..db38d1f6d 100644
--- a/langs/themes/ca.json
+++ b/langs/themes/ca.json
@@ -276,10 +276,10 @@
"tagRenderings+": {
"0": {
"mappings": {
- "1": {
+ "3": {
"then": "Aquest carrer és una ciclocarrer"
},
- "2": {
+ "4": {
"then": "Aquest carrer es convertirà en un ciclocarrer pròximament"
}
}
diff --git a/langs/themes/de.json b/langs/themes/de.json
index 7dabcbd5b..93aa44529 100644
--- a/langs/themes/de.json
+++ b/langs/themes/de.json
@@ -414,19 +414,32 @@
"0": {
"then": "Diese Straße ist eine Fahrradstraße (mit einer Geschwindigkeitsbegrenzung von 30 km/h)"
},
- "1": {
+ "3": {
"then": "Diese Straße ist eine Fahrradstraße"
},
- "2": {
+ "4": {
"then": "Diese Straße wird bald eine Fahrradstraße sein"
},
- "3": {
+ "6": {
"then": "Diese Straße ist keine Fahrradstraße"
}
},
"question": "Ist die Straße {name} eine Fahrradstraße?"
},
"1": {
+ "mappings": {
+ "0": {
+ "then": "Anlieger frei"
+ },
+ "1": {
+ "then": "KFZ frei"
+ },
+ "2": {
+ "then": "Motorräder frei"
+ }
+ }
+ },
+ "2": {
"question": "Wann wird diese Straße eine Fahrradstraße?",
"render": "Diese Straße wird am {cyclestreet:start_date} zu einer Fahrradstraße"
}
@@ -654,68 +667,6 @@
"description": "Eine Karte mit Bordsteinen und Überwegen.",
"title": "Bordsteine und Überwege"
},
- "mapcomplete-changes": {
- "description": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen",
- "layers": {
- "0": {
- "description": "Zeigt alle MapComplete Änderungen",
- "filter": {
- "0": {
- "options": {
- "0": {
- "question": "Themenname enthält {search}"
- }
- }
- },
- "1": {
- "options": {
- "0": {
- "question": "Erstellt von {search}"
- }
- }
- },
- "2": {
- "options": {
- "0": {
- "question": "Nicht erstellt von {search}"
- }
- }
- }
- },
- "name": "Zentrum der Änderungssätze",
- "tagRenderings": {
- "contributor": {
- "render": "Geändert von {_last_edit:contributor}"
- },
- "render_id": {
- "render": "Änderungssatz {id}"
- },
- "theme": {
- "mappings": {
- "0": {
- "then": "Änderung mit inoffiziellem Thema {theme}"
- }
- },
- "render": "Änderung mit Thema {theme}"
- }
- },
- "title": {
- "render": "Änderungssatz für {theme}"
- }
- },
- "1": {
- "override": {
- "tagRenderings": {
- "link_to_more": {
- "render": "Weitere Statistiken finden Sie hier"
- }
- }
- }
- }
- },
- "shortDescription": "Zeigt die mit MapComplete vorgenommenen Änderungen",
- "title": "Mit MapComplete vorgenommene Änderungen"
- },
"maproulette": {
"description": "Thema mit MapRoulette-Aufgaben, die Sie suchen, filtern und beheben können.",
"title": "MapRoulette-Aufgaben"
diff --git a/langs/themes/en.json b/langs/themes/en.json
index b69461ddd..2ce045362 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -415,18 +415,44 @@
"then": "This street is a cyclestreet (and has a speed limit of 30 km/h)"
},
"1": {
- "then": "This street is a cyclestreet"
+ "then": "This street is a bicycle road"
},
"2": {
- "then": "This street will become a cyclstreet soon"
+ "then": "This street is a bicycle road (has a speed limit of 30 km/h and vehicles are not allowed) (supplementary signs will be asked later)"
},
"3": {
+ "then": "This street is a cyclestreet"
+ },
+ "4": {
+ "then": "This street will become a cyclstreet soon"
+ },
+ "5": {
+ "then": "This street will become a bicycle road soon"
+ },
+ "6": {
"then": "This street is not a cyclestreet"
}
},
"question": "Is the street {name} a cyclestreet?"
},
"1": {
+ "mappings": {
+ "0": {
+ "then": "Residents allowed"
+ },
+ "1": {
+ "then": "Motor vehicles allowed"
+ },
+ "2": {
+ "then": "Motorcycles allowed"
+ },
+ "3": {
+ "then": "Cars allowed"
+ }
+ },
+ "question": "What supplementary signs does this bicycle road have?"
+ },
+ "2": {
"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 8bdf32655..b6ad8a9ff 100644
--- a/langs/themes/es.json
+++ b/langs/themes/es.json
@@ -316,19 +316,19 @@
"0": {
"then": "Esta calle es una ciclocalle (y tiene un límite de velocidad de 30km/h)"
},
- "1": {
+ "3": {
"then": "Esta calle es una ciclocalle"
},
- "2": {
+ "4": {
"then": "Esta calle se convertirá en una ciclocalle próximamente"
},
- "3": {
+ "6": {
"then": "Esta calle no es una ciclocalle"
}
},
"question": "¿La calle {name} es una ciclocalle?"
},
- "1": {
+ "2": {
"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 ebad67004..02e808a02 100644
--- a/langs/themes/fr.json
+++ b/langs/themes/fr.json
@@ -414,19 +414,19 @@
"0": {
"then": "Cette rue est une rue cyclable (et est limitée à 30 km/h)"
},
- "1": {
+ "3": {
"then": "Cette rue est une rue cyclable"
},
- "2": {
+ "4": {
"then": "Cette rue sera bientôt une rue cyclable"
},
- "3": {
+ "6": {
"then": "Cette rue n’est pas une rue cyclable"
}
},
"question": "La rue {name} est-elle une rue cyclable ?"
},
- "1": {
+ "2": {
"question": "Quand cette rue deviendra-t-elle cyclable ?",
"render": "Cette rue deviendra une rue cyclable le {cyclestreet:start_date}"
}
@@ -654,68 +654,6 @@
"description": "Une carte affichant les ressauts et traversées.",
"title": "Ressauts et traversées"
},
- "mapcomplete-changes": {
- "description": "Cette carte affiche toutes les modifications réalisées avec MapComplete",
- "layers": {
- "0": {
- "description": "Afficher toutes les modifications MapComplete",
- "filter": {
- "0": {
- "options": {
- "0": {
- "question": "Nom de thème contenant {search}"
- }
- }
- },
- "1": {
- "options": {
- "0": {
- "question": "Réalisé par {search}"
- }
- }
- },
- "2": {
- "options": {
- "0": {
- "question": "Non réalisé par {search}"
- }
- }
- }
- },
- "name": "Centre du groupe de modifications",
- "tagRenderings": {
- "contributor": {
- "render": "Modification faite par {_last_edit:contributor}"
- },
- "render_id": {
- "render": "Groupe de modifications {id}"
- },
- "theme": {
- "mappings": {
- "0": {
- "then": "Modification avec le thème non-officiel {theme}"
- }
- },
- "render": "Modification avec le thème {theme}"
- }
- },
- "title": {
- "render": "Groupe de modifications pour {theme}"
- }
- },
- "1": {
- "override": {
- "tagRenderings": {
- "link_to_more": {
- "render": "D’autres statistiques sont disponibles ici"
- }
- }
- }
- }
- },
- "shortDescription": "Montrer les changements faits avec MapComplete",
- "title": "Changements faits avec MapComplete"
- },
"maproulette": {
"description": "Thème MapRoulette permettant d’afficher, rechercher, filtrer et résoudre les tâches.",
"title": "Tâches MapRoulette"
diff --git a/langs/themes/hu.json b/langs/themes/hu.json
index 964fde035..160531e3f 100644
--- a/langs/themes/hu.json
+++ b/langs/themes/hu.json
@@ -134,19 +134,19 @@
"0": {
"then": "Ez az utca kerékpárosutca (és 30 km/h a sebességkorlátozás)"
},
- "1": {
+ "3": {
"then": "Ez az utca kerékpárosutca"
},
- "2": {
+ "4": {
"then": "Ez az utca hamarosan kerékpárosutcává válik"
},
- "3": {
+ "6": {
"then": "Ez az utca nem kerékpárosutca"
}
},
"question": "Kerékpárosutca-e {name}?"
},
- "1": {
+ "2": {
"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/it.json b/langs/themes/it.json
index fbed99743..3fe6ffe22 100644
--- a/langs/themes/it.json
+++ b/langs/themes/it.json
@@ -361,19 +361,19 @@
"0": {
"then": "Questa è una strada ciclabile (e ha un limite di velocità massima di 30 km/h)"
},
- "1": {
+ "3": {
"then": "Questa è una strada ciclabile"
},
- "2": {
+ "4": {
"then": "Diverrà tra poco una strada ciclabile"
},
- "3": {
+ "6": {
"then": "Questa strada non è una strada ciclabile"
}
},
"question": "È {name} una strada ciclabile?"
},
- "1": {
+ "2": {
"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..bfc3688cd 100644
--- a/langs/themes/ja.json
+++ b/langs/themes/ja.json
@@ -291,18 +291,18 @@
"0": {
"then": "cyclestreet(最高速度は30km/h)"
},
- "1": {
+ "3": {
"then": "この通りはcyclestreetだ"
},
- "2": {
+ "4": {
"then": "この通りはまもなくcyclstreetになるだろう"
},
- "3": {
+ "6": {
"then": "この通りはcyclestreetではない"
}
}
},
- "1": {
+ "2": {
"question": "この通りはいつcyclestreetになるんですか?",
"render": "この通りは{cyclestreet:start_date}に、cyclestreetになります"
}
diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json
index c1f49dafc..7d35bbf07 100644
--- a/langs/themes/nb_NO.json
+++ b/langs/themes/nb_NO.json
@@ -257,19 +257,19 @@
"0": {
"then": "Denne gaten er en sykkelvei (og har en fartsgrense på 30 km/t)"
},
- "1": {
+ "3": {
"then": "Denne gaten er en sykkelvei"
},
- "2": {
+ "4": {
"then": "Denne gaten vil bli sykkelvei ganske snart"
},
- "3": {
+ "6": {
"then": "Denne gaten er ikke en sykkelvei"
}
},
"question": "Er {name}-gaten en sykkelgate?"
},
- "1": {
+ "2": {
"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 f35622a8a..51655c9fe 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -418,19 +418,19 @@
"0": {
"then": "Deze straat is een fietsstraat (en dus zone 30)"
},
- "1": {
+ "3": {
"then": "Deze straat is een fietsstraat"
},
- "2": {
+ "4": {
"then": "Deze straat wordt binnenkort een fietsstraat"
},
- "3": {
+ "6": {
"then": "Deze straat is geen fietsstraat"
}
},
"question": "Is de straat {name} een fietsstraat?"
},
- "1": {
+ "2": {
"question": "Wanneer wordt deze straat een fietsstraat?",
"render": "Deze straat wordt fietsstraat op {cyclestreet:start_date}"
}