From 4b6f3bdb0b40fe7bafd9ba630db0c57f74c2d98f Mon Sep 17 00:00:00 2001 From: Bartosz Dokurno Date: Fri, 11 Feb 2022 14:58:10 +0100 Subject: [PATCH] Match meteoalarm naming scheme (#72) --- src/data.js | 8 ++++---- src/integrations/dwd.js | 4 ++-- src/integrations/meteoalarm.js | 8 ++++---- src/integrations/meteofrance.js | 10 +++++----- src/integrations/weatheralerts.js | 6 +++--- src/translations/de.json | 6 +++--- src/translations/en.json | 6 +++--- src/translations/es.json | 6 +++--- src/translations/et.json | 2 +- src/translations/fr.json | 2 +- src/translations/hr.json | 2 +- src/translations/it.json | 2 +- src/translations/nl.json | 2 +- src/translations/pl.json | 4 ++-- src/translations/schema/schema.json | 6 +++--- src/translations/sk.json | 6 +++--- src/translations/sv.json | 6 +++--- 17 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/data.js b/src/data.js index 959b5bf..7c35f22 100644 --- a/src/data.js +++ b/src/data.js @@ -26,16 +26,16 @@ export default class Data // If for example there is warning for wind AND rain // Rain has higher priority (you can expect wind while raining) return [ - new Event('Forestfire', 'pine-tree-fire', 'events.forest_fire'), + new Event('Forest fire', 'pine-tree-fire', 'events.forest_fire'), new Event('Avalanches', 'image-filter-hdr', 'events.avalanches'), - new Event('Flood', 'home-flood', 'events.flood'), + new Event('Flooding', 'home-flood', 'events.flooding'), new Event('Rain-Flood', 'home-flood', 'events.rain_flood'), new Event('Coastal Event', 'waves', 'events.coastal_event'), new Event('Thunderstorms', 'weather-lightning', 'events.thunderstorms'), new Event('Rain', 'weather-pouring', 'events.rain'), new Event('Snow/Ice', 'weather-snowy-heavy', 'events.snow_ice'), - new Event('Extreme high temperature', 'thermometer', 'events.hight_temperature'), - new Event('Extreme low temperature', 'snowflake', 'events.low_temperature'), + new Event('High temperature', 'thermometer', 'events.hight_temperature'), + new Event('Low temperature', 'snowflake', 'events.low_temperature'), new Event('Wind', 'windsock', 'events.wind'), new Event('Fog', 'weather-fog', 'events.fog'), diff --git a/src/integrations/dwd.js b/src/integrations/dwd.js index 2ddb061..c5ae6c3 100644 --- a/src/integrations/dwd.js +++ b/src/integrations/dwd.js @@ -72,8 +72,8 @@ export class DWDIntegration 93: Data.getEventByName('Thunderstorms'), 95: Data.getEventByName('Thunderstorms'), 96: Data.getEventByName('Thunderstorms'), - 246: Data.getEventByName('Extreme high temperature'), - 247: Data.getEventByName('Extreme high temperature'), + 246: Data.getEventByName('High temperature'), + 247: Data.getEventByName('High temperature'), 11: Data.getEventByName('Coastal Event'), 12: Data.getEventByName('Coastal Event'), 13: Data.getEventByName('Coastal Event'), diff --git a/src/integrations/meteoalarm.js b/src/integrations/meteoalarm.js index dcff7d4..2e5b438 100644 --- a/src/integrations/meteoalarm.js +++ b/src/integrations/meteoalarm.js @@ -25,13 +25,13 @@ export class MeteoAlarmIntegration Data.getEventByName('Snow/Ice'), Data.getEventByName('Thunderstorms'), Data.getEventByName('Fog'), - Data.getEventByName('Extreme high temperature'), - Data.getEventByName('Extreme low temperature'), + Data.getEventByName('High temperature'), + Data.getEventByName('Low temperature'), Data.getEventByName('Coastal Event'), - Data.getEventByName('Forestfire'), + Data.getEventByName('Forest fire'), Data.getEventByName('Avalanches'), Data.getEventByName('Rain'), - Data.getEventByName('Flood'), + Data.getEventByName('Flooding'), Data.getEventByName('Rain-Flood') ]; } diff --git a/src/integrations/meteofrance.js b/src/integrations/meteofrance.js index 8c33fd7..efb7e9a 100644 --- a/src/integrations/meteofrance.js +++ b/src/integrations/meteofrance.js @@ -10,8 +10,8 @@ const EVENT_SNOW_ICE = 'Neige-verglas'; const EVENT_THUNDERSTORMS = 'Orages'; const EVENT_FLOOD = 'Inondation'; const EVENT_RAIN_FLOOD = 'Pluie-inondation'; -const EVENT_EXTREME_HIGH_TEMPERATURE = 'Canicule'; -const EVENT_EXTREME_LOW_TEMPERATURE = 'Grand-froid'; +const EVENT_HIGH_TEMPERATURE = 'Canicule'; +const EVENT_LOW_TEMPERATURE = 'Grand-froid'; export class MeteoFranceIntegration { @@ -35,10 +35,10 @@ export class MeteoFranceIntegration [EVENT_WIND]: Data.getEventByName('Wind'), [EVENT_SNOW_ICE]: Data.getEventByName('Snow/Ice'), [EVENT_THUNDERSTORMS]: Data.getEventByName('Thunderstorms'), - [EVENT_FLOOD]: Data.getEventByName('Flood'), + [EVENT_FLOOD]: Data.getEventByName('Flooding'), [EVENT_RAIN_FLOOD]: Data.getEventByName('Rain-Flood'), - [EVENT_EXTREME_HIGH_TEMPERATURE]: Data.getEventByName('Extreme high temperature'), - [EVENT_EXTREME_LOW_TEMPERATURE]: Data.getEventByName('Extreme low temperature'), + [EVENT_HIGH_TEMPERATURE]: Data.getEventByName('High temperature'), + [EVENT_LOW_TEMPERATURE]: Data.getEventByName('Low temperature'), }; } diff --git a/src/integrations/weatheralerts.js b/src/integrations/weatheralerts.js index b19f435..cf409d7 100644 --- a/src/integrations/weatheralerts.js +++ b/src/integrations/weatheralerts.js @@ -23,12 +23,12 @@ export class WeatherAlertsIntegration 'Severe Thunderstorm Warning': Data.getEventByName('Thunderstorms'), 'Severe Weather Statement': Data.getEventByName('Thunderstorms'), 'High Wind Warning': Data.getEventByName('Wind'), - 'Flood Warning': Data.getEventByName('Flood'), + 'Flood Warning': Data.getEventByName('Flooding'), 'Severe Thunderstorm Watch': Data.getEventByName('Thunderstorms'), 'Gale Warning': Data.getEventByName('Wind'), 'Freeze Warning': Data.getEventByName('Snow/Ice'), - 'Red Flag Warning': Data.getEventByName('Forestfire'), - 'Flood Advisory': Data.getEventByName('Flood'), + 'Red Flag Warning': Data.getEventByName('Forest fire'), + 'Flood Advisory': Data.getEventByName('Flooding'), 'Heavy Freezing Spray Warning': Data.getEventByName('Snow/Ice'), 'Small Craft Advisory': Data.getEventByName('Wind'), 'Lake Wind Advisory': Data.getEventByName('Wind'), diff --git a/src/translations/de.json b/src/translations/de.json index 4e8bc5b..d1a7bfc 100644 --- a/src/translations/de.json +++ b/src/translations/de.json @@ -29,13 +29,13 @@ "snow_ice": "Schnee/Eis", "thunderstorms": "Gewitter", "fog": "Nebel", - "hight_temperature": "Extrem hohe Temperatur", - "low_temperature": "Extrem niedrige Temperatur", + "hight_temperature": "hohe Temperatur", + "low_temperature": "niedrige Temperatur", "coastal_event": "Küstenereignis", "forest_fire": "Waldbrand", "avalanches": "Lawinen", "rain": "Regen", - "flood": "Hochwasser", + "flooding": null, "rain_flood": "Starkregenhochwasser" }, "messages": { diff --git a/src/translations/en.json b/src/translations/en.json index 5e9a6c7..a957819 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -29,13 +29,13 @@ "snow_ice": "snow/ice", "thunderstorms": "thunderstorms", "fog": "fog", - "hight_temperature": "extreme high temperature", - "low_temperature": "extreme low temperature", + "hight_temperature": "high temperature", + "low_temperature": "low temperature", "coastal_event": "coastal event", "forest_fire": "forest fire", "avalanches": "avalanches", "rain": "rain", - "flood": "flood", + "flooding": null, "rain_flood": "rain flood" }, "messages": { diff --git a/src/translations/es.json b/src/translations/es.json index b9e4499..a4583f0 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -29,13 +29,13 @@ "snow_ice": "nieve/hielo", "thunderstorms": "tormentas", "fog": "niebla", - "hight_temperature": "temperatura máxima extrema", - "low_temperature": "temperatura mínima extrema", + "hight_temperature": null, + "low_temperature": null, "coastal_event": "fenómeno costero", "forest_fire": "incendios", "avalanches": "aludes", "rain": "lluvia", - "flood": "inundación", + "flooding": null, "rain_flood": "inundación de lluvia" }, "messages": { diff --git a/src/translations/et.json b/src/translations/et.json index 0d7c117..37a7fda 100644 --- a/src/translations/et.json +++ b/src/translations/et.json @@ -35,7 +35,7 @@ "forest_fire": "metsapõleng", "avalanches": "laviin", "rain": "sademed", - "flood": "üleujutus", + "flooding": null, "rain_flood": "paduvihm" }, "messages": { diff --git a/src/translations/fr.json b/src/translations/fr.json index 0dcb68f..0c7f7de 100644 --- a/src/translations/fr.json +++ b/src/translations/fr.json @@ -35,7 +35,7 @@ "forest_fire": "feu de forêt", "avalanches": "avalanches", "rain": "pluie", - "flood": "inondation", + "flooding": null, "rain_flood": "pluie-inondation" }, "messages": { diff --git a/src/translations/hr.json b/src/translations/hr.json index 2ae0c7c..f235772 100644 --- a/src/translations/hr.json +++ b/src/translations/hr.json @@ -35,7 +35,7 @@ "forest_fire": "šumski požar", "avalanches": "lavinu", "rain": "kišu", - "flood": "poplavu", + "flooding": null, "rain_flood": "bujičnu poplavu" }, "messages": { diff --git a/src/translations/it.json b/src/translations/it.json index d108efa..886b69a 100644 --- a/src/translations/it.json +++ b/src/translations/it.json @@ -35,7 +35,7 @@ "forest_fire": "incendi boschivi", "avalanches": "valanghe", "rain": "pioggia", - "flood": "inondazioni", + "flooding": null, "rain_flood": "acquazzoni" }, "messages": { diff --git a/src/translations/nl.json b/src/translations/nl.json index a05b0d9..0ef838b 100644 --- a/src/translations/nl.json +++ b/src/translations/nl.json @@ -35,7 +35,7 @@ "forest_fire": "bos- en heidebranden", "avalanches": "lawines", "rain": "regen", - "flood": "hoogwater", + "flooding": null, "rain_flood": "wateroverlast" }, "messages": { diff --git a/src/translations/pl.json b/src/translations/pl.json index deb17c8..c2fb4e8 100644 --- a/src/translations/pl.json +++ b/src/translations/pl.json @@ -30,12 +30,12 @@ "thunderstorms": "burze", "fog": "mgły", "hight_temperature": "upały", - "low_temperature": "silne Mrozy", + "low_temperature": "silne mrozy", "coastal_event": "zjawiska strefy brzegowej", "forest_fire": "pożary lasu", "avalanches": "lawiny", "rain": "deszcz", - "flood": "powodzie", + "flooding": "powodzie", "rain_flood": "ulewy" }, "messages": { diff --git a/src/translations/schema/schema.json b/src/translations/schema/schema.json index 782c0f8..b724f86 100644 --- a/src/translations/schema/schema.json +++ b/src/translations/schema/schema.json @@ -141,7 +141,7 @@ "forest_fire", "avalanches", "rain", - "flood", + "flooding", "rain_flood" ], "properties": { @@ -189,8 +189,8 @@ "$id": "#/properties/events/properties/rain", "type": ["string", "null"] }, - "flood": { - "$id": "#/properties/events/properties/flood", + "flooding": { + "$id": "#/properties/events/properties/flooding", "type": ["string", "null"] }, "rain_flood": { diff --git a/src/translations/sk.json b/src/translations/sk.json index f3770f2..8f04647 100644 --- a/src/translations/sk.json +++ b/src/translations/sk.json @@ -29,13 +29,13 @@ "snow_ice": "sneh/ľad", "thunderstorms": "búrky", "fog": "hmla", - "hight_temperature": "extrémne vysoká teplota", - "low_temperature": "extrémne nízka teplota", + "hight_temperature": "vysoká teplota", + "low_temperature": "nízka teplota", "coastal_event": "pobrežná udalosť", "forest_fire": "lesný požiar", "avalanches": "lavíny", "rain": "dážď", - "flood": "povodeň", + "flooding": null, "rain_flood": "dažďová povodeň" }, "messages": { diff --git a/src/translations/sv.json b/src/translations/sv.json index 91933d3..bf30602 100644 --- a/src/translations/sv.json +++ b/src/translations/sv.json @@ -29,13 +29,13 @@ "snow_ice": "snö/is", "thunderstorms": "åska", "fog": "dimma", - "hight_temperature": "extremt hög temperatur", - "low_temperature": "extremt låg temperatur", + "hight_temperature": "hög temperatur", + "low_temperature": "låg temperatur", "coastal_event": "kusthändelse", "forest_fire": "skogsbrand", "avalanches": "laviner", "rain": "regn", - "flood": "höga flöden", + "flooding": null, "rain_flood": "störtfloder" }, "messages": {