From 320f38802d57bbdc275d4a3784e37597e7d83b7f Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Sun, 3 Apr 2022 03:10:06 +0200 Subject: [PATCH] Add article to presets --- .../ambulancestation/ambulancestation.json | 2 +- assets/layers/artwork/artwork.json | 2 +- assets/layers/barrier/barrier.json | 4 +- assets/layers/bench/bench.json | 2 +- .../bicycle_library/bicycle_library.json | 4 +- .../layers/bicycle_rental/bicycle_rental.json | 4 +- .../bicycle_tube_vending_machine.json | 2 +- assets/layers/bike_cafe/bike_cafe.json | 2 +- .../layers/bike_cleaning/bike_cleaning.json | 2 +- assets/layers/bike_parking/bike_parking.json | 2 +- .../bike_repair_station.json | 6 +- assets/layers/bike_shop/bike_shop.json | 2 +- assets/layers/binocular/binocular.json | 2 +- assets/layers/birdhide/birdhide.json | 4 +- assets/layers/cafe_pub/cafe_pub.json | 6 +- .../charging_station/charging_station.json | 4 +- assets/layers/crossings/crossings.json | 4 +- .../layers/defibrillator/defibrillator.json | 4 +- .../layers/drinking_water/drinking_water.json | 2 +- assets/layers/extinguisher/extinguisher.json | 2 +- assets/layers/fire_station/fire_station.json | 2 +- assets/layers/food/food.json | 6 +- assets/layers/ghost_bike/ghost_bike.json | 2 +- assets/layers/hydrant/hydrant.json | 2 +- .../information_board/information_board.json | 2 +- assets/layers/map/map.json | 2 +- .../layers/nature_reserve/nature_reserve.json | 2 +- assets/layers/parking/parking.json | 2 +- assets/layers/picnic_table/picnic_table.json | 2 +- assets/layers/playground/playground.json | 2 +- .../public_bookcase/public_bookcase.json | 2 +- assets/layers/recycling/recycling.json | 4 +- assets/layers/shops/shops.json | 2 +- assets/layers/sport_pitch/sport_pitch.json | 4 +- assets/layers/street_lamps/street_lamps.json | 2 +- .../surveillance_camera.json | 4 +- assets/layers/toilet/toilet.json | 4 +- assets/layers/tree_node/tree_node.json | 6 +- assets/layers/viewpoint/viewpoint.json | 2 +- assets/layers/waste_basket/waste_basket.json | 2 +- .../layers/waste_disposal/waste_disposal.json | 2 +- assets/themes/campersite/campersite.json | 4 +- assets/themes/climbing/climbing.json | 8 +- .../themes/facadegardens/facadegardens.json | 2 +- assets/themes/hackerspaces/hackerspaces.json | 4 +- .../openwindpowermap/openwindpowermap.json | 2 +- assets/themes/postboxes/postboxes.json | 4 +- langs/layers/en.json | 118 +++++++++--------- langs/layers/nl.json | 2 +- langs/themes/en.json | 24 ++-- scripts/lint.ts | 17 ++- 51 files changed, 156 insertions(+), 149 deletions(-) diff --git a/assets/layers/ambulancestation/ambulancestation.json b/assets/layers/ambulancestation/ambulancestation.json index d7d921813..04225f0db 100644 --- a/assets/layers/ambulancestation/ambulancestation.json +++ b/assets/layers/ambulancestation/ambulancestation.json @@ -247,7 +247,7 @@ "emergency=ambulance_station" ], "title": { - "en": "Ambulance station", + "en": "an ambulance station", "ru": "Станция скорой помощи", "ja": "救急ステーション(消防署)", "fr": "une station d’ambulances", diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json index 7df12ba1f..88bfa5dc1 100644 --- a/assets/layers/artwork/artwork.json +++ b/assets/layers/artwork/artwork.json @@ -87,7 +87,7 @@ "tourism=artwork" ], "title": { - "en": "Artwork", + "en": "an artwork", "nl": "een kunstwerk", "fr": "une œuvre d'art", "de": "eine kunstwerk", diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json index d147e9978..8dc665404 100644 --- a/assets/layers/barrier/barrier.json +++ b/assets/layers/barrier/barrier.json @@ -60,7 +60,7 @@ "presets": [ { "title": { - "en": "Bollard", + "en": "a bollard", "nl": "een paaltje", "de": "eine poller", "ru": "Прикол", @@ -88,7 +88,7 @@ }, { "title": { - "en": "Cycle barrier", + "en": "a cycle barrier", "nl": "een fietshekjes", "de": "eine fahrradhindernis", "hu": "Kerékpárakadály", diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json index 2748c73d4..85c30e2ed 100644 --- a/assets/layers/bench/bench.json +++ b/assets/layers/bench/bench.json @@ -605,7 +605,7 @@ "amenity=bench" ], "title": { - "en": "bench", + "en": "a bench", "de": "eine sitzbank", "fr": "une banc", "nl": "een zitbank", diff --git a/assets/layers/bicycle_library/bicycle_library.json b/assets/layers/bicycle_library/bicycle_library.json index e2c5d1e63..36e9953e1 100644 --- a/assets/layers/bicycle_library/bicycle_library.json +++ b/assets/layers/bicycle_library/bicycle_library.json @@ -239,8 +239,8 @@ "presets": [ { "title": { - "en": "Fietsbibliotheek", - "nl": "een bicycle library", + "nl": "een fietsbibliotheek", + "en": "a bicycle library", "ru": "Велосипедная библиотека", "zh_Hant": "自行車圖書館 ( Fietsbibliotheek)", "it": "una bici in prestito", diff --git a/assets/layers/bicycle_rental/bicycle_rental.json b/assets/layers/bicycle_rental/bicycle_rental.json index f2b28a8d2..628526abd 100644 --- a/assets/layers/bicycle_rental/bicycle_rental.json +++ b/assets/layers/bicycle_rental/bicycle_rental.json @@ -289,7 +289,7 @@ "presets": [ { "title": { - "en": "bicycle rental shop", + "en": "a bicycle rental shop", "nl": "een fietsverhuurzaak", "fr": "une magasin de location de vélos" }, @@ -305,7 +305,7 @@ }, { "title": { - "en": "bicycle rental", + "en": "a bicycle rental", "nl": "een fietsverhuur" }, "tags": [ diff --git a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json index 43ee693eb..f4944cc39 100644 --- a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json +++ b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json @@ -49,7 +49,7 @@ "presets": [ { "title": { - "en": "Bicycle tube vending machine", + "en": "a bicycle tube vending machine", "nl": "een fietsbanden-verkoopsautomaat", "fr": "une distributeur automatique de chambre à air de vélo", "it": "una distributore automatico di camere d’aria per bici", diff --git a/assets/layers/bike_cafe/bike_cafe.json b/assets/layers/bike_cafe/bike_cafe.json index d124bd648..bde626bdf 100644 --- a/assets/layers/bike_cafe/bike_cafe.json +++ b/assets/layers/bike_cafe/bike_cafe.json @@ -336,7 +336,7 @@ "presets": [ { "title": { - "en": "Bike cafe", + "en": "a bike cafe", "nl": "een fietscafé", "fr": "une café vélo", "gl": "Café de ciclistas", diff --git a/assets/layers/bike_cleaning/bike_cleaning.json b/assets/layers/bike_cleaning/bike_cleaning.json index 8637eff60..dc941704d 100644 --- a/assets/layers/bike_cleaning/bike_cleaning.json +++ b/assets/layers/bike_cleaning/bike_cleaning.json @@ -51,7 +51,7 @@ "presets": [ { "title": { - "en": "Bike cleaning service", + "en": "a bike cleaning service", "nl": "een fietsschoonmaakpunt", "fr": "une service de nettoyage de vélo", "it": "una servizio lavaggio bici", diff --git a/assets/layers/bike_parking/bike_parking.json b/assets/layers/bike_parking/bike_parking.json index 7b580090d..3eebe3c94 100644 --- a/assets/layers/bike_parking/bike_parking.json +++ b/assets/layers/bike_parking/bike_parking.json @@ -25,7 +25,7 @@ "presets": [ { "title": { - "en": "Bike parking", + "en": "a bike parking", "nl": "een fietsparking", "fr": "une parking à vélo", "gl": "Aparcadoiro de bicicletas", diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json index a9e266dd4..e64f05346 100644 --- a/assets/layers/bike_repair_station/bike_repair_station.json +++ b/assets/layers/bike_repair_station/bike_repair_station.json @@ -657,7 +657,7 @@ "presets": [ { "title": { - "en": "bike pump", + "en": "a bike pump", "nl": "een fietspomp", "fr": "une pompe à vélo", "gl": "bomba de ar", @@ -691,7 +691,7 @@ }, { "title": { - "en": "bike repair station and pump", + "en": "a bike repair station and pump", "nl": "een herstelpunt en pomp", "fr": "une point de réparation vélo avec pompe", "gl": "estación de arranxo de bicicletas con bomba de ar", @@ -718,7 +718,7 @@ }, { "title": { - "en": "bike repair station without pump", + "en": "a bike repair station without pump", "nl": "een herstelpunt zonder pomp", "fr": "une point de réparation vélo sans pompe", "gl": "estación de arranxo de bicicletas sin bomba de ar", diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json index b77f8df94..f3758c298 100644 --- a/assets/layers/bike_shop/bike_shop.json +++ b/assets/layers/bike_shop/bike_shop.json @@ -670,7 +670,7 @@ "presets": [ { "title": { - "en": "Bike repair/shop", + "en": "a bike repair/shop", "nl": "een fietszaak", "fr": "une magasin et réparateur de vélo", "gl": "Tenda/arranxo de bicicletas", diff --git a/assets/layers/binocular/binocular.json b/assets/layers/binocular/binocular.json index 936587c0c..3ed6a4bed 100644 --- a/assets/layers/binocular/binocular.json +++ b/assets/layers/binocular/binocular.json @@ -81,7 +81,7 @@ "amenity=binoculars" ], "title": { - "en": "binoculars", + "en": "a binoculars", "nl": "een verrekijker", "de": "eine ferngläser", "ru": "бинокль" diff --git a/assets/layers/birdhide/birdhide.json b/assets/layers/birdhide/birdhide.json index 4f35f1433..d93f39103 100644 --- a/assets/layers/birdhide/birdhide.json +++ b/assets/layers/birdhide/birdhide.json @@ -233,7 +233,7 @@ "amenity=shelter" ], "title": { - "en": "Birdhide", + "en": "a birdhide", "nl": "een vogelkijkhut" }, "description": { @@ -248,7 +248,7 @@ "shelter=no" ], "title": { - "en": "Bird blind", + "en": "a bird blind", "nl": "een vogelkijkwand" }, "description": { diff --git a/assets/layers/cafe_pub/cafe_pub.json b/assets/layers/cafe_pub/cafe_pub.json index c18a75835..6af50b66d 100644 --- a/assets/layers/cafe_pub/cafe_pub.json +++ b/assets/layers/cafe_pub/cafe_pub.json @@ -24,7 +24,7 @@ "amenity=pub" ], "title": { - "en": "pub", + "en": "a pub", "nl": "een bruin cafe of kroeg", "de": "eine kneipe", "ru": "паб", @@ -43,7 +43,7 @@ "amenity=bar" ], "title": { - "en": "bar", + "en": "a bar", "nl": "een bar", "de": "eine bar", "ru": "бар", @@ -62,7 +62,7 @@ "amenity=cafe" ], "title": { - "en": "cafe", + "en": "a cafe", "nl": "een cafe", "de": "eine café", "ru": "кафе", diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 859ee8954..993989894 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -4000,7 +4000,7 @@ "socket:typee=1" ], "title": { - "en": "charging station for electrical bikes with a normal european wall plug (meant to charge electrical bikes)", + "en": "a charging station for electrical bikes with a normal european wall plug (meant to charge electrical bikes)", "nl": "een oplaadpunt voor elektrische fietsen" }, "preciseInput": { @@ -4014,7 +4014,7 @@ "bicycle=no" ], "title": { - "en": "charging station for cars", + "en": "a charging station for cars", "nl": "een oplaadstation voor elektrische auto's", "de": "eine ladestation für e-bikes" }, diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json index 8d9a9a7f6..410c82f83 100644 --- a/assets/layers/crossings/crossings.json +++ b/assets/layers/crossings/crossings.json @@ -53,7 +53,7 @@ "presets": [ { "title": { - "en": "Crossing", + "en": "a crossing", "nl": "een oversteekplaats", "de": "eine kreuzung", "fr": "une traversée" @@ -77,7 +77,7 @@ }, { "title": { - "en": "Traffic signal", + "en": "a traffic signal", "nl": "een verkeerslicht", "ru": "Светофор", "de": "eine ampel", diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json index 49127b4a3..e388be166 100644 --- a/assets/layers/defibrillator/defibrillator.json +++ b/assets/layers/defibrillator/defibrillator.json @@ -35,7 +35,7 @@ "presets": [ { "title": { - "en": "Defibrillator", + "en": "a defibrillator", "ca": "Desfibril·lador", "es": "una desfibrilador", "fr": "une défibrillateur", @@ -51,7 +51,7 @@ }, { "title": { - "en": "defibrillator mounted on a wall", + "en": "a defibrillator mounted on a wall", "nl": "een defibrillator die aan een muur hangt", "sl": "defibrilator je pritrjen na steno" }, diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json index c72c72d39..77c54bd76 100644 --- a/assets/layers/drinking_water/drinking_water.json +++ b/assets/layers/drinking_water/drinking_water.json @@ -42,7 +42,7 @@ "presets": [ { "title": { - "en": "drinking water", + "en": "a drinking water", "nl": "een drinkbaar water", "fr": "une eau potable", "gl": "auga potábel", diff --git a/assets/layers/extinguisher/extinguisher.json b/assets/layers/extinguisher/extinguisher.json index e03245705..60bc67d8f 100644 --- a/assets/layers/extinguisher/extinguisher.json +++ b/assets/layers/extinguisher/extinguisher.json @@ -106,7 +106,7 @@ "emergency=fire_extinguisher" ], "title": { - "en": "Fire extinguisher", + "en": "a fire extinguisher", "ja": "消火器", "nb_NO": "en brannslukker", "ru": "Огнетушитель", diff --git a/assets/layers/fire_station/fire_station.json b/assets/layers/fire_station/fire_station.json index 66a224ca8..4a7fdce3c 100644 --- a/assets/layers/fire_station/fire_station.json +++ b/assets/layers/fire_station/fire_station.json @@ -215,7 +215,7 @@ "amenity=fire_station" ], "title": { - "en": "Fire station", + "en": "a fire station", "ja": "消防署", "ru": "Пожарная часть", "fr": "une caserne de pompiers", diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index fad134f75..cb999e864 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -17,7 +17,7 @@ "presets": [ { "title": { - "en": "restaurant", + "en": "a restaurant", "nl": "een restaurant", "ru": "ресторан", "de": "eine restaurant" @@ -36,7 +36,7 @@ }, { "title": { - "en": "fastfood", + "en": "a fastfood", "nl": "een fastfood-zaak", "ru": "быстрое питание", "de": "eine schnellimbiss" @@ -55,7 +55,7 @@ }, { "title": { - "en": "fries shop", + "en": "a fries shop", "nl": "een frituur", "de": "eine pommesbude" }, diff --git a/assets/layers/ghost_bike/ghost_bike.json b/assets/layers/ghost_bike/ghost_bike.json index 263c1a4c5..2cc72ae6f 100644 --- a/assets/layers/ghost_bike/ghost_bike.json +++ b/assets/layers/ghost_bike/ghost_bike.json @@ -61,7 +61,7 @@ "presets": [ { "title": { - "en": "Ghost bike", + "en": "a ghost bike", "nl": "een witte fiets", "de": "eine geisterrad", "it": "una bici fantasma", diff --git a/assets/layers/hydrant/hydrant.json b/assets/layers/hydrant/hydrant.json index 0a50cbf18..4d7e1e177 100644 --- a/assets/layers/hydrant/hydrant.json +++ b/assets/layers/hydrant/hydrant.json @@ -294,7 +294,7 @@ "emergency=fire_hydrant" ], "title": { - "en": "Fire hydrant", + "en": "a fire hydrant", "ru": "Пожарный гидрант", "ja": "消火栓", "nb_NO": "en brannhydrant", diff --git a/assets/layers/information_board/information_board.json b/assets/layers/information_board/information_board.json index 8c4ec46b2..514778bb1 100644 --- a/assets/layers/information_board/information_board.json +++ b/assets/layers/information_board/information_board.json @@ -37,7 +37,7 @@ ], "title": { "nl": "een informatiebord", - "en": "information board", + "en": "an information board", "it": "una pannello informativo", "fr": "une panneau d'informations", "de": "eine informationstafel", diff --git a/assets/layers/map/map.json b/assets/layers/map/map.json index 310e161c2..156f5d789 100644 --- a/assets/layers/map/map.json +++ b/assets/layers/map/map.json @@ -172,7 +172,7 @@ "tourism=map" ], "title": { - "en": "Map", + "en": "a map", "nl": "een kaart", "it": "una mappa", "ru": "Карта", diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json index 362257149..8556b2915 100644 --- a/assets/layers/nature_reserve/nature_reserve.json +++ b/assets/layers/nature_reserve/nature_reserve.json @@ -380,7 +380,7 @@ "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen" ], "title": { - "en": "nature reserve", + "en": "a nature reserve", "nl": "een natuurreservaat" }, "description": { diff --git a/assets/layers/parking/parking.json b/assets/layers/parking/parking.json index 7ffa142a0..d37861438 100644 --- a/assets/layers/parking/parking.json +++ b/assets/layers/parking/parking.json @@ -28,7 +28,7 @@ ], "title": { "nl": "een parking voor auto's", - "en": "car parking" + "en": "a car parking" } } ], diff --git a/assets/layers/picnic_table/picnic_table.json b/assets/layers/picnic_table/picnic_table.json index 88c805a05..e485f691f 100644 --- a/assets/layers/picnic_table/picnic_table.json +++ b/assets/layers/picnic_table/picnic_table.json @@ -85,7 +85,7 @@ "leisure=picnic_table" ], "title": { - "en": "picnic table", + "en": "a picnic table", "nl": "een picnic-tafel", "it": "una tavolo da picnic", "ru": "стол для пикника", diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json index b457ffee7..e707ea531 100644 --- a/assets/layers/playground/playground.json +++ b/assets/layers/playground/playground.json @@ -493,7 +493,7 @@ ], "title": { "nl": "een speeltuin", - "en": "playground", + "en": "a playground", "ru": "Детская площадка", "fr": "une terrain de jeux", "it": "una campetto", diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json index e48135a86..959b4d7bf 100644 --- a/assets/layers/public_bookcase/public_bookcase.json +++ b/assets/layers/public_bookcase/public_bookcase.json @@ -50,7 +50,7 @@ "presets": [ { "title": { - "en": "Bookcase", + "en": "a bookcase", "nl": "een boekenruilkast", "de": "eine bücherschrank", "fr": "une microbibliothèque", diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json index ec34478d5..1a84d7caa 100644 --- a/assets/layers/recycling/recycling.json +++ b/assets/layers/recycling/recycling.json @@ -407,7 +407,7 @@ "presets": [ { "title": { - "en": "recycling container", + "en": "a recycling container", "nl": "een recycling container" }, "tags": [ @@ -417,7 +417,7 @@ }, { "title": { - "en": "recycling centre", + "en": "a recycling centre", "nl": "een recycling centre" }, "tags": [ diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json index edbd599a8..8f0e2ccd2 100644 --- a/assets/layers/shops/shops.json +++ b/assets/layers/shops/shops.json @@ -331,7 +331,7 @@ "shop=yes" ], "title": { - "en": "Shop", + "en": "a shop", "fr": "une magasin", "ru": "Магазин", "ja": "店", diff --git a/assets/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json index e9adc044d..223ebdb5b 100644 --- a/assets/layers/sport_pitch/sport_pitch.json +++ b/assets/layers/sport_pitch/sport_pitch.json @@ -427,7 +427,7 @@ "title": { "nl": "een ping-pong tafel", "fr": "une table de ping-pong", - "en": "Tabletennis table", + "en": "a tabletennis table", "it": "una tavolo da tennistavolo", "ru": "Стол для настольного тенниса", "de": "eine tischtennisplatte" @@ -441,7 +441,7 @@ "title": { "nl": "een sportterrein", "fr": "une terrain de sport", - "en": "Sport pitch", + "en": "a sport pitch", "ru": "Спортивная площадка", "it": "una campo sportivo", "de": "eine sportplatz" diff --git a/assets/layers/street_lamps/street_lamps.json b/assets/layers/street_lamps/street_lamps.json index 838ad184f..da9414825 100644 --- a/assets/layers/street_lamps/street_lamps.json +++ b/assets/layers/street_lamps/street_lamps.json @@ -42,7 +42,7 @@ "presets": [ { "title": { - "en": "street lamp", + "en": "a street lamp", "nl": "een straatlantaarn" }, "tags": [ diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json index a6a2f31b9..94adb8cb1 100644 --- a/assets/layers/surveillance_camera/surveillance_camera.json +++ b/assets/layers/surveillance_camera/surveillance_camera.json @@ -460,7 +460,7 @@ "surveillance:type=camera" ], "title": { - "en": "surveillance camera" + "en": "a surveillance camera" } }, { @@ -470,7 +470,7 @@ "camera:mount=wall" ], "title": { - "en": "surveillance camera mounted on a wall" + "en": "a surveillance camera mounted on a wall" }, "preciseInput": { "snapToLayer": "walls_and_buildings" diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json index fbf145f56..19424b2c8 100644 --- a/assets/layers/toilet/toilet.json +++ b/assets/layers/toilet/toilet.json @@ -25,7 +25,7 @@ "presets": [ { "title": { - "en": "public toilet", + "en": "a public toilet", "de": "eine öffentlich zugängliche toilette", "fr": "une toilette publique", "nl": "een publiek toilet", @@ -38,7 +38,7 @@ }, { "title": { - "en": "toilets with wheelchair accessible toilet", + "en": "a toilets with wheelchair accessible toilet", "de": "eine toiletten mit rollstuhlgerechter toilette", "fr": "une toilettes accessible aux personnes à mobilité réduite", "nl": "een rolstoeltoegankelijke, publiek toilet", diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json index 2725bb913..66e3824f5 100644 --- a/assets/layers/tree_node/tree_node.json +++ b/assets/layers/tree_node/tree_node.json @@ -521,7 +521,7 @@ ], "title": { "nl": "een loofboom", - "en": "Broadleaved tree", + "en": "a broadleaved tree", "it": "una albero latifoglia", "fr": "une arbre feuillu", "ru": "Лиственное дерево", @@ -545,7 +545,7 @@ ], "title": { "nl": "een naaldboom", - "en": "Needleleaved tree", + "en": "a needleleaved tree", "it": "una albero aghifoglia", "ru": "Хвойное дерево", "fr": "une arbre résineux", @@ -569,7 +569,7 @@ ], "title": { "nl": "een boom", - "en": "Tree", + "en": "a tree", "it": "una albero", "ru": "Дерево", "fr": "une arbre", diff --git a/assets/layers/viewpoint/viewpoint.json b/assets/layers/viewpoint/viewpoint.json index 2f314af15..c6cae3fda 100644 --- a/assets/layers/viewpoint/viewpoint.json +++ b/assets/layers/viewpoint/viewpoint.json @@ -25,7 +25,7 @@ "presets": [ { "title": { - "en": "Viewpoint", + "en": "a viewpoint", "nl": "een uitzicht", "de": "eine aussichtspunkt", "fr": "une point de vue", diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json index 554a65481..26165777f 100644 --- a/assets/layers/waste_basket/waste_basket.json +++ b/assets/layers/waste_basket/waste_basket.json @@ -156,7 +156,7 @@ "amenity=waste_basket" ], "title": { - "en": "Waste Basket", + "en": "a waste basket", "nl": "een vuilnisbak", "ru": "Контейнер для мусора", "de": "eine abfalleimer", diff --git a/assets/layers/waste_disposal/waste_disposal.json b/assets/layers/waste_disposal/waste_disposal.json index 1ccf33db4..14bb2d643 100644 --- a/assets/layers/waste_disposal/waste_disposal.json +++ b/assets/layers/waste_disposal/waste_disposal.json @@ -29,7 +29,7 @@ "presets": [ { "title": { - "en": "Waste Disposal Bin" + "en": "a waste disposal bin" }, "tags": [ "amenity=waste_disposal" diff --git a/assets/themes/campersite/campersite.json b/assets/themes/campersite/campersite.json index ffe8d336a..ec99db59f 100644 --- a/assets/themes/campersite/campersite.json +++ b/assets/themes/campersite/campersite.json @@ -648,7 +648,7 @@ "tourism=caravan_site" ], "title": { - "en": "camper site", + "en": "a camper site", "ru": "площадка для кемпинга", "ja": "キャンプサイト", "zh_Hant": "露營地", @@ -1103,7 +1103,7 @@ "amenity=sanitary_dump_station" ], "title": { - "en": "sanitary dump station", + "en": "a sanitary dump station", "ja": "衛生ゴミ捨て場", "it": "una luogo di sversamento delle acque reflue", "fr": "une site de vidange", diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json index 5e4d20a51..f48ce9bfa 100644 --- a/assets/themes/climbing/climbing.json +++ b/assets/themes/climbing/climbing.json @@ -160,7 +160,7 @@ ], "title": { "de": "eine kletterverein", - "en": "Climbing club", + "en": "a climbing club", "nl": "een klimclub", "ja": "クライミングクラブ", "nb_NO": "en klatreklubb", @@ -188,7 +188,7 @@ ], "title": { "de": "eine eine kletter-organisation", - "en": "Climbing NGO", + "en": "a climbing ngo", "nl": "een een klimorganisatie", "ja": "クライミングNGO", "fr": "une association d’escalade", @@ -561,7 +561,7 @@ "presets": [ { "title": { - "en": "Climbing route", + "en": "a climbing route", "nl": "een klimroute", "fr": "une voie d’escalade", "de": "eine kletterroute", @@ -855,7 +855,7 @@ "sport=climbing" ], "title": { - "en": "Climbing opportunity", + "en": "a climbing opportunity", "nl": "een klimgelegenheid", "de": "eine klettermöglichkeit", "ja": "登坂教室", diff --git a/assets/themes/facadegardens/facadegardens.json b/assets/themes/facadegardens/facadegardens.json index 2dd67fd06..a626ac7d1 100644 --- a/assets/themes/facadegardens/facadegardens.json +++ b/assets/themes/facadegardens/facadegardens.json @@ -395,7 +395,7 @@ ], "title": { "nl": "een geveltuintje", - "en": "facade garden", + "en": "a facade garden", "ja": "ファサード庭園", "it": "una giardino verticale", "fr": "une jardin mural", diff --git a/assets/themes/hackerspaces/hackerspaces.json b/assets/themes/hackerspaces/hackerspaces.json index cdb05d3e2..5629c0a30 100644 --- a/assets/themes/hackerspaces/hackerspaces.json +++ b/assets/themes/hackerspaces/hackerspaces.json @@ -214,7 +214,7 @@ "leisure=hackerspace" ], "title": { - "en": "Hackerspace", + "en": "a hackerspace", "de": "eine hackerspace", "ru": "Хакерспейс", "zh_Hant": "駭客空間", @@ -233,7 +233,7 @@ "hackerspace=makerspace" ], "title": { - "en": "Makerspace", + "en": "a makerspace", "de": "eine makerspace", "zh_Hant": "創客空間", "hu": "Makerspace" diff --git a/assets/themes/openwindpowermap/openwindpowermap.json b/assets/themes/openwindpowermap/openwindpowermap.json index 5bf674c77..fd013b450 100644 --- a/assets/themes/openwindpowermap/openwindpowermap.json +++ b/assets/themes/openwindpowermap/openwindpowermap.json @@ -189,7 +189,7 @@ "generator:source=wind" ], "title": { - "en": "wind turbine", + "en": "a wind turbine", "nl": "een windturbine", "fr": "une éolienne", "de": "eine windrad", diff --git a/assets/themes/postboxes/postboxes.json b/assets/themes/postboxes/postboxes.json index 70d000b4c..6af9af343 100644 --- a/assets/themes/postboxes/postboxes.json +++ b/assets/themes/postboxes/postboxes.json @@ -79,7 +79,7 @@ "amenity=post_box" ], "title": { - "en": "postbox", + "en": "a postbox", "de": "eine briefkasten", "ru": "почтовый ящик", "zh_Hant": "郵筒", @@ -195,7 +195,7 @@ "amenity=post_office" ], "title": { - "en": "Post Office", + "en": "a post office", "de": "eine poststelle", "ru": "Почтовое отделение", "zh_Hant": "郵局", diff --git a/langs/layers/en.json b/langs/layers/en.json index 81b2589b9..45330c63f 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -30,7 +30,7 @@ "presets": { "0": { "description": "Add an ambulance station to the map", - "title": "Ambulance station" + "title": "an ambulance station" } }, "tagRenderings": { @@ -78,7 +78,7 @@ "name": "Artworks", "presets": { "0": { - "title": "Artwork" + "title": "an artwork" } }, "tagRenderings": { @@ -152,11 +152,11 @@ "presets": { "0": { "description": "A bollard in the road", - "title": "Bollard" + "title": "a bollard" }, "1": { "description": "Cycle barrier, slowing down cyclists", - "title": "Cycle barrier" + "title": "a cycle barrier" } }, "tagRenderings": { @@ -252,7 +252,7 @@ "name": "Benches", "presets": { "0": { - "title": "bench" + "title": "a bench" } }, "tagRenderings": { @@ -378,7 +378,7 @@ "presets": { "0": { "description": "A bicycle library has a collection of bikes which can be lent", - "title": "Fietsbibliotheek" + "title": "a bicycle library" } }, "tagRenderings": { @@ -435,10 +435,10 @@ "presets": { "0": { "description": "A manned shop which focuses on bicycle rental", - "title": "bicycle rental shop" + "title": "a bicycle rental shop" }, "1": { - "title": "bicycle rental" + "title": "a bicycle rental" } }, "tagRenderings": { @@ -540,7 +540,7 @@ "name": "Bicycle tube vending machine", "presets": { "0": { - "title": "Bicycle tube vending machine" + "title": "a bicycle tube vending machine" } }, "tagRenderings": { @@ -569,7 +569,7 @@ "name": "Bike cafe", "presets": { "0": { - "title": "Bike cafe" + "title": "a bike cafe" } }, "tagRenderings": { @@ -637,7 +637,7 @@ "name": "Bike cleaning service", "presets": { "0": { - "title": "Bike cleaning service" + "title": "a bike cleaning service" } }, "tagRenderings": { @@ -686,7 +686,7 @@ "name": "Bike parking", "presets": { "0": { - "title": "Bike parking" + "title": "a bike parking" } }, "tagRenderings": { @@ -796,15 +796,15 @@ "presets": { "0": { "description": "A device to inflate your tires on a fixed location in the public space.", - "title": "bike pump" + "title": "a bike pump" }, "1": { "description": "A bicycle pump and tools to repair your bike in the public space. The tools are often secured with chains against theft.", - "title": "bike repair station and pump" + "title": "a bike repair station and pump" }, "2": { "description": "Tools to repair your bike in the public space (without pump). The tools are secured against theft.", - "title": "bike repair station without pump" + "title": "a bike repair station without pump" } }, "tagRenderings": { @@ -963,7 +963,7 @@ "name": "Bike repair/shop", "presets": { "0": { - "title": "Bike repair/shop" + "title": "a bike repair/shop" } }, "tagRenderings": { @@ -1118,7 +1118,7 @@ "presets": { "0": { "description": "A telescope or pair of binoculars mounted on a pole, available to the public to look around. ", - "title": "binoculars" + "title": "a binoculars" } }, "tagRenderings": { @@ -1162,11 +1162,11 @@ "presets": { "0": { "description": "A covered shelter where one can watch birds comfortably", - "title": "Birdhide" + "title": "a birdhide" }, "1": { "description": "A screen or wall with openings to watch birds", - "title": "Bird blind" + "title": "a bird blind" } }, "tagRenderings": { @@ -1251,15 +1251,15 @@ "presets": { "0": { "description": "A pub, mostly for drinking beers in a warm, relaxed interior", - "title": "pub" + "title": "a pub" }, "1": { "description": "A more modern and commercial bar, possibly with a music and light installation", - "title": "bar" + "title": "a bar" }, "2": { "description": "A cafe to drink tea, coffee or an alcoholical bevarage in a quiet environment", - "title": "cafe" + "title": "a cafe" } }, "tagRenderings": { @@ -1379,10 +1379,10 @@ "name": "Charging stations", "presets": { "0": { - "title": "charging station for electrical bikes with a normal european wall plug (meant to charge electrical bikes)" + "title": "a charging station for electrical bikes with a normal european wall plug (meant to charge electrical bikes)" }, "1": { - "title": "charging station for cars" + "title": "a charging station for cars" } }, "tagRenderings": { @@ -2303,11 +2303,11 @@ "presets": { "0": { "description": "Crossing for pedestrians and/or cyclists", - "title": "Crossing" + "title": "a crossing" }, "1": { "description": "Traffic signal on a road", - "title": "Traffic signal" + "title": "a traffic signal" } }, "tagRenderings": { @@ -2798,10 +2798,10 @@ "name": "Defibrillators", "presets": { "0": { - "title": "Defibrillator" + "title": "a defibrillator" }, "1": { - "title": "defibrillator mounted on a wall" + "title": "a defibrillator mounted on a wall" } }, "tagRenderings": { @@ -2930,7 +2930,7 @@ "name": "Drinking water", "presets": { "0": { - "title": "drinking water" + "title": "a drinking water" } }, "tagRenderings": { @@ -3104,7 +3104,7 @@ "presets": { "0": { "description": "A fire extinguisher is a small, portable device used to stop a fire", - "title": "Fire extinguisher" + "title": "a fire extinguisher" } }, "tagRenderings": { @@ -3131,7 +3131,7 @@ "presets": { "0": { "description": "A fire station is a place where the fire trucks and firefighters are located when not in operation.", - "title": "Fire station" + "title": "a fire station" } }, "tagRenderings": { @@ -3222,15 +3222,15 @@ "presets": { "0": { "description": "A formal eating place with sit-down facilities selling full meals served by waiters", - "title": "restaurant" + "title": "a restaurant" }, "1": { "description": "A food business concentrating on fast counter-only service and take-away food", - "title": "fastfood" + "title": "a fastfood" }, "2": { "description": "A fastfood-buisiness focused on french fries", - "title": "fries shop" + "title": "a fries shop" } }, "tagRenderings": { @@ -3439,7 +3439,7 @@ "name": "Ghost bikes", "presets": { "0": { - "title": "Ghost bike" + "title": "a ghost bike" } }, "tagRenderings": { @@ -3494,7 +3494,7 @@ "presets": { "0": { "description": "A hydrant is a connection point where firefighters can tap water. It might be located underground.", - "title": "Fire hydrant" + "title": "a fire hydrant" } }, "tagRenderings": { @@ -3558,7 +3558,7 @@ "name": "Information boards", "presets": { "0": { - "title": "information board" + "title": "an information board" } }, "title": { @@ -3571,7 +3571,7 @@ "presets": { "0": { "description": "Add a missing map", - "title": "Map" + "title": "a map" } }, "tagRenderings": { @@ -3637,7 +3637,7 @@ "presets": { "0": { "description": "Add a missing nature reserve", - "title": "nature reserve" + "title": "a nature reserve" } }, "tagRenderings": { @@ -3913,7 +3913,7 @@ "name": "Parking", "presets": { "0": { - "title": "car parking" + "title": "a car parking" } }, "title": { @@ -3929,7 +3929,7 @@ "name": "Picnic tables", "presets": { "0": { - "title": "picnic table" + "title": "a picnic table" } }, "tagRenderings": { @@ -3955,7 +3955,7 @@ "name": "Playgrounds", "presets": { "0": { - "title": "playground" + "title": "a playground" } }, "tagRenderings": { @@ -4089,7 +4089,7 @@ "name": "Bookcases", "presets": { "0": { - "title": "Bookcase" + "title": "a bookcase" } }, "tagRenderings": { @@ -4260,10 +4260,10 @@ "name": "Recycling", "presets": { "0": { - "title": "recycling container" + "title": "a recycling container" }, "1": { - "title": "recycling centre" + "title": "a recycling centre" } }, "tagRenderings": { @@ -4410,7 +4410,7 @@ "presets": { "0": { "description": "Add a new shop", - "title": "Shop" + "title": "a shop" } }, "tagRenderings": { @@ -4512,10 +4512,10 @@ "name": "Sport pitches", "presets": { "0": { - "title": "Tabletennis table" + "title": "a tabletennis table" }, "1": { - "title": "Sport pitch" + "title": "a sport pitch" } }, "tagRenderings": { @@ -4622,7 +4622,7 @@ "name": "Street Lamps", "presets": { "0": { - "title": "street lamp" + "title": "a street lamp" } }, "tagRenderings": { @@ -4771,10 +4771,10 @@ "name": "Surveillance camera's", "presets": { "0": { - "title": "surveillance camera" + "title": "a surveillance camera" }, "1": { - "title": "surveillance camera mounted on a wall" + "title": "a surveillance camera mounted on a wall" } }, "tagRenderings": { @@ -4916,11 +4916,11 @@ "name": "Toilets", "presets": { "0": { - "title": "public toilet" + "title": "a public toilet" }, "1": { "description": "A restroom which has at least one wheelchair-accessible toilet", - "title": "toilets with wheelchair accessible toilet" + "title": "a toilets with wheelchair accessible toilet" } }, "tagRenderings": { @@ -5085,15 +5085,15 @@ "presets": { "0": { "description": "A tree of a species with leaves, such as oak or populus.", - "title": "Broadleaved tree" + "title": "a broadleaved tree" }, "1": { "description": "A tree of a species with needles, such as pine or spruce.", - "title": "Needleleaved tree" + "title": "a needleleaved tree" }, "2": { "description": "If you're not sure whether it's a broadleaved or needleleaved tree.", - "title": "Tree" + "title": "a tree" } }, "tagRenderings": { @@ -5206,7 +5206,7 @@ "name": "Viewpoint", "presets": { "0": { - "title": "Viewpoint" + "title": "a viewpoint" } }, "tagRenderings": { @@ -5289,7 +5289,7 @@ "name": "Waste Basket", "presets": { "0": { - "title": "Waste Basket" + "title": "a waste basket" } }, "tagRenderings": { @@ -5353,7 +5353,7 @@ "presets": { "0": { "description": "Medium to large bin for disposal of (household) waste", - "title": "Waste Disposal Bin" + "title": "a waste disposal bin" } }, "tagRenderings": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 51183d4f4..00f638ee9 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -378,7 +378,7 @@ "presets": { "0": { "description": "Een fietsbieb heeft een collectie fietsen die leden mogen lenen", - "title": "een bicycle library" + "title": "een fietsbibliotheek" } }, "tagRenderings": { diff --git a/langs/themes/en.json b/langs/themes/en.json index 50be66eff..80a08d43f 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -43,7 +43,7 @@ "presets": { "0": { "description": "Add a new official camper site. These are designated places to stay overnight with your camper. They might look like a real camping or just look like a parking. They might not be signposted at all, but just be defined in a municipal decision. A regular parking intended for campers where it is not expected to spend the night, is -not- a camper site ", - "title": "camper site" + "title": "a camper site" } }, "tagRenderings": { @@ -155,7 +155,7 @@ "presets": { "0": { "description": "Add a new sanitary dump station. This is a place where camper drivers can dump waste water or chemical toilet waste. Often there's also drinking water and electricity.", - "title": "sanitary dump station" + "title": "a sanitary dump station" } }, "tagRenderings": { @@ -276,11 +276,11 @@ "presets": { "0": { "description": "A climbing club", - "title": "Climbing club" + "title": "a climbing club" }, "1": { "description": "An NGO working around climbing", - "title": "Climbing NGO" + "title": "a climbing ngo" } }, "tagRenderings": { @@ -320,7 +320,7 @@ "name": "Climbing routes", "presets": { "0": { - "title": "Climbing route" + "title": "a climbing route" } }, "tagRenderings": { @@ -372,7 +372,7 @@ "presets": { "0": { "description": "A climbing opportunity", - "title": "Climbing opportunity" + "title": "a climbing opportunity" } }, "tagRenderings": { @@ -773,7 +773,7 @@ "presets": { "0": { "description": "Add a facade garden", - "title": "facade garden" + "title": "a facade garden" } }, "tagRenderings": { @@ -913,11 +913,11 @@ "presets": { "0": { "description": "A hackerspace is an area where people interested in software gather", - "title": "Hackerspace" + "title": "a hackerspace" }, "1": { "description": "A makerspace is a place where DIY-enthusiasts gather to experiment with electronics such as arduino, LEDstrips, ...", - "title": "Makerspace" + "title": "a makerspace" } }, "tagRenderings": { @@ -1067,7 +1067,7 @@ "name": "wind turbine", "presets": { "0": { - "title": "wind turbine" + "title": "a wind turbine" } }, "tagRenderings": { @@ -1175,7 +1175,7 @@ "name": "Postboxes", "presets": { "0": { - "title": "postbox" + "title": "a postbox" } }, "title": { @@ -1196,7 +1196,7 @@ "name": "Post offices", "presets": { "0": { - "title": "Post Office" + "title": "a post office" } }, "tagRenderings": { diff --git a/scripts/lint.ts b/scripts/lint.ts index ba964fd53..3ac0cc076 100644 --- a/scripts/lint.ts +++ b/scripts/lint.ts @@ -18,29 +18,36 @@ t.OnEveryLanguage((txt, ln) => { }) const articles = { - de: "eine", + /* de: "eine", es: 'una', fr: 'une', it: 'una', nb_NO: 'en', nl: 'een', pt: 'uma', - pt_BR : 'uma', + pt_BR : 'uma',//*/ } function addArticleToPresets(layerConfig: {presets?: {title: any}[]}){ - /* + //* if(layerConfig.presets === undefined){ return } for (const preset of layerConfig.presets) { preset.title = new Translation(preset.title, "autofix") .OnEveryLanguage((txt, lang) => { - const article = articles[lang] + let article = articles[lang] + if(lang === "en"){ + if(["a","e","u","o","i"].some(vowel => txt.toLowerCase().startsWith(vowel))) { + article = "an" + }else{ + article = "a" + } + } if(article === undefined){ return txt; } - if(txt.startsWith(article)){ + if(txt.startsWith(article+" ")){ return txt; } return article +" " + txt.toLowerCase();