From cef1728fd236ab00dc7561de749d95ca6e8a6eab Mon Sep 17 00:00:00 2001 From: nielstron Date: Mon, 12 Feb 2018 00:28:43 +0100 Subject: [PATCH 01/15] Adding keywords and handling for snow/rain requests "Is it raining" will be handled, as well as "does it snow" --- __init__.py | 19 +++++++++++++------ vocab/en-us/Precipitation.voc | 2 ++ vocab/en-us/Query.voc | 2 ++ vocab/en-us/WeatherType.voc | 18 ++++++++++++------ 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/__init__.py b/__init__.py index 3b925654..0e609db5 100644 --- a/__init__.py +++ b/__init__.py @@ -222,13 +222,19 @@ def handle_forecast(self, message): # Handle: When will it rain again? | Will it rain on Tuesday? @intent_handler(IntentBuilder("NextPrecipitationIntent").require( "Next").require("Precipitation").optionally("Location").build()) + @intent_handler(IntentBuilder("CurrentRainSnowIntent").require( + "Query").require("Precipitation").optionally("Location").build()) def handle_next_precipitation(self, message): report = self.__initialize_report(message) # Get a date from spoken request - today = extract_datetime(" ")[0] + today = extract_datetime(" ")[0] # this is None when = extract_datetime(message.data.get('utterance'))[0] - + if today == when: + forecasting = 'today' + else: + forecasting = 'expected' + # search the forecast for precipitation for weather in self.owm.daily_forecast( report['full_location'], @@ -236,7 +242,8 @@ def handle_next_precipitation(self, message): report['lon']).get_forecast().get_weathers(): forecastDate = datetime.fromtimestamp(weather.get_reference_time()) - + + # TODO: "will it rain tomorrow" returns forecast for today, if it rains today if when != today: # User asked about a specific date, is this it? whenGMT = self.__to_GMT(when) @@ -255,7 +262,7 @@ def handle_next_precipitation(self, message): elif rain["all"] > 20: data["modifier"] = self.__translate("heavy") - self.speak_dialog("precipitation expected", data) + self.speak_dialog("precipitation." + forecasting, data) return snow = weather.get_snow() @@ -270,10 +277,10 @@ def handle_next_precipitation(self, message): elif snow["all"] > 20: data["modifier"] = self.__translate("heavy") - self.speak_dialog("precipitation expected", data) + self.speak_dialog("precipitation." + forecasting, data) return - self.speak_dialog("no precipitation expected", report) + self.speak_dialog("precipitation.not_expected", report) # Handle: What's the weather later? @intent_handler(IntentBuilder("NextHoursWeatherIntent").require( diff --git a/vocab/en-us/Precipitation.voc b/vocab/en-us/Precipitation.voc index 42c0a0c0..d4a8fd4f 100644 --- a/vocab/en-us/Precipitation.voc +++ b/vocab/en-us/Precipitation.voc @@ -1,5 +1,7 @@ rain snow +raining +snowing precipitation rainy snowy diff --git a/vocab/en-us/Query.voc b/vocab/en-us/Query.voc index b874ed1f..7bbcb03c 100644 --- a/vocab/en-us/Query.voc +++ b/vocab/en-us/Query.voc @@ -2,3 +2,5 @@ how what is tell when +is it +does it \ No newline at end of file diff --git a/vocab/en-us/WeatherType.voc b/vocab/en-us/WeatherType.voc index 79188010..c0a177b5 100644 --- a/vocab/en-us/WeatherType.voc +++ b/vocab/en-us/WeatherType.voc @@ -1,8 +1,14 @@ -rain|raining -snow|snowing +rain +raining +snow +snowing sleet -hail|hailing -sunny|sun -hot|warm -cold|cool +hail +hailing +sunny +sun +hot +warm +cold +cool From a981f6db6bbea216a476f160bea4e20e86f73b3d Mon Sep 17 00:00:00 2001 From: nielstron Date: Mon, 12 Feb 2018 00:34:04 +0100 Subject: [PATCH 02/15] Handling dialogs for current rain/snow requests TODO: italian translation --- dialog/de-de/precipitation.expected.dialog | 2 ++ dialog/de-de/precipitation.not_expected.dialog | 4 ++++ dialog/de-de/precipitation.today.dialog | 2 ++ dialog/en-us/precipitation.expected.dialog | 2 ++ dialog/en-us/precipitation.not_expected.dialog | 2 ++ dialog/en-us/precipitation.today.dialog | 2 ++ dialog/it-it/precipitatio.expected.dialog | 2 ++ dialog/it-it/precipitatio.today.dialog | 2 ++ dialog/it-it/precipitation.not_expected.dialog | 1 + 9 files changed, 19 insertions(+) create mode 100644 dialog/de-de/precipitation.expected.dialog create mode 100644 dialog/de-de/precipitation.not_expected.dialog create mode 100644 dialog/de-de/precipitation.today.dialog create mode 100644 dialog/en-us/precipitation.expected.dialog create mode 100644 dialog/en-us/precipitation.not_expected.dialog create mode 100644 dialog/en-us/precipitation.today.dialog create mode 100644 dialog/it-it/precipitatio.expected.dialog create mode 100644 dialog/it-it/precipitatio.today.dialog create mode 100644 dialog/it-it/precipitation.not_expected.dialog diff --git a/dialog/de-de/precipitation.expected.dialog b/dialog/de-de/precipitation.expected.dialog new file mode 100644 index 00000000..32df0aae --- /dev/null +++ b/dialog/de-de/precipitation.expected.dialog @@ -0,0 +1,2 @@ +{{modifier}} {{precip}} wird am {{day}} erwartet +Die Vorhersage nennt {{modifier}} {{precip}} am {{day}} diff --git a/dialog/de-de/precipitation.not_expected.dialog b/dialog/de-de/precipitation.not_expected.dialog new file mode 100644 index 00000000..5cf86fa3 --- /dev/null +++ b/dialog/de-de/precipitation.not_expected.dialog @@ -0,0 +1,4 @@ +es wird kein Niederschlag erwartet +es wird nicht Regnen oder scheien +du brauchst keinen Regenschirm mitnehmen + diff --git a/dialog/de-de/precipitation.today.dialog b/dialog/de-de/precipitation.today.dialog new file mode 100644 index 00000000..bc378319 --- /dev/null +++ b/dialog/de-de/precipitation.today.dialog @@ -0,0 +1,2 @@ +{{modifier}} {{precip}} ist heute zu erwarten +Heute fällt {{modifier}} {{precip}} diff --git a/dialog/en-us/precipitation.expected.dialog b/dialog/en-us/precipitation.expected.dialog new file mode 100644 index 00000000..08aad1d7 --- /dev/null +++ b/dialog/en-us/precipitation.expected.dialog @@ -0,0 +1,2 @@ +{{modifier}} {{precip}} is expected on {{day}} +The forecast calls for {{modifier}} {{precip}} on {{day}} diff --git a/dialog/en-us/precipitation.not_expected.dialog b/dialog/en-us/precipitation.not_expected.dialog new file mode 100644 index 00000000..6ccf889a --- /dev/null +++ b/dialog/en-us/precipitation.not_expected.dialog @@ -0,0 +1,2 @@ +No precipitation is in the forecast +None is forecasted diff --git a/dialog/en-us/precipitation.today.dialog b/dialog/en-us/precipitation.today.dialog new file mode 100644 index 00000000..88a3f156 --- /dev/null +++ b/dialog/en-us/precipitation.today.dialog @@ -0,0 +1,2 @@ +Currently there is {{modifier}} {{precip}} +Today there is {{modifier}} {{precip}} diff --git a/dialog/it-it/precipitatio.expected.dialog b/dialog/it-it/precipitatio.expected.dialog new file mode 100644 index 00000000..9d8dbd9d --- /dev/null +++ b/dialog/it-it/precipitatio.expected.dialog @@ -0,0 +1,2 @@ +{{modifier}} {{precip}} è previsto per {{day}} +La previsione indica {{modifier}} {{precip}} per {{day}} diff --git a/dialog/it-it/precipitatio.today.dialog b/dialog/it-it/precipitatio.today.dialog new file mode 100644 index 00000000..0b655d41 --- /dev/null +++ b/dialog/it-it/precipitatio.today.dialog @@ -0,0 +1,2 @@ +{{modifier}} {{precip}} è previsto +La previsione indica {{modifier}} {{precip}} diff --git a/dialog/it-it/precipitation.not_expected.dialog b/dialog/it-it/precipitation.not_expected.dialog new file mode 100644 index 00000000..08409ceb --- /dev/null +++ b/dialog/it-it/precipitation.not_expected.dialog @@ -0,0 +1 @@ +Nessuna precipitazione nelle previsioni From 53f0c507d92a00b7dabe20167256196050b366f3 Mon Sep 17 00:00:00 2001 From: nielstron Date: Mon, 12 Feb 2018 00:36:13 +0100 Subject: [PATCH 03/15] Delete precipitation expected.dialog --- dialog/de-de/precipitation expected.dialog | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 dialog/de-de/precipitation expected.dialog diff --git a/dialog/de-de/precipitation expected.dialog b/dialog/de-de/precipitation expected.dialog deleted file mode 100644 index 32df0aae..00000000 --- a/dialog/de-de/precipitation expected.dialog +++ /dev/null @@ -1,2 +0,0 @@ -{{modifier}} {{precip}} wird am {{day}} erwartet -Die Vorhersage nennt {{modifier}} {{precip}} am {{day}} From 6e1c5a2fb86f2f87f7db5172fb6c9c2c27a16637 Mon Sep 17 00:00:00 2001 From: nielstron Date: Mon, 12 Feb 2018 00:36:25 +0100 Subject: [PATCH 04/15] Delete no precipitation expected.dialog --- dialog/de-de/no precipitation expected.dialog | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 dialog/de-de/no precipitation expected.dialog diff --git a/dialog/de-de/no precipitation expected.dialog b/dialog/de-de/no precipitation expected.dialog deleted file mode 100644 index 5cf86fa3..00000000 --- a/dialog/de-de/no precipitation expected.dialog +++ /dev/null @@ -1,4 +0,0 @@ -es wird kein Niederschlag erwartet -es wird nicht Regnen oder scheien -du brauchst keinen Regenschirm mitnehmen - From 7c87ca843f0f361bb8357bf3a6086edcb0fe7f19 Mon Sep 17 00:00:00 2001 From: nielstron Date: Mon, 12 Feb 2018 00:36:53 +0100 Subject: [PATCH 05/15] Delete precipitation expected.dialog --- dialog/en-us/precipitation expected.dialog | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 dialog/en-us/precipitation expected.dialog diff --git a/dialog/en-us/precipitation expected.dialog b/dialog/en-us/precipitation expected.dialog deleted file mode 100644 index 08aad1d7..00000000 --- a/dialog/en-us/precipitation expected.dialog +++ /dev/null @@ -1,2 +0,0 @@ -{{modifier}} {{precip}} is expected on {{day}} -The forecast calls for {{modifier}} {{precip}} on {{day}} From 9c9529c4a872d740817e692c38a882259d072efe Mon Sep 17 00:00:00 2001 From: nielstron Date: Mon, 12 Feb 2018 00:37:05 +0100 Subject: [PATCH 06/15] Delete no precipitation expected.dialog --- dialog/en-us/no precipitation expected.dialog | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 dialog/en-us/no precipitation expected.dialog diff --git a/dialog/en-us/no precipitation expected.dialog b/dialog/en-us/no precipitation expected.dialog deleted file mode 100644 index 6ccf889a..00000000 --- a/dialog/en-us/no precipitation expected.dialog +++ /dev/null @@ -1,2 +0,0 @@ -No precipitation is in the forecast -None is forecasted From 26261219e9f985370dc3a7014bb2c1ef6f104d02 Mon Sep 17 00:00:00 2001 From: nielstron Date: Mon, 12 Feb 2018 00:37:17 +0100 Subject: [PATCH 07/15] Delete no precipitation expected.dialog --- dialog/it-it/no precipitation expected.dialog | 1 - 1 file changed, 1 deletion(-) delete mode 100644 dialog/it-it/no precipitation expected.dialog diff --git a/dialog/it-it/no precipitation expected.dialog b/dialog/it-it/no precipitation expected.dialog deleted file mode 100644 index 08409ceb..00000000 --- a/dialog/it-it/no precipitation expected.dialog +++ /dev/null @@ -1 +0,0 @@ -Nessuna precipitazione nelle previsioni From f9b3eee3be85e4873ea651d34cce70969e0cb11a Mon Sep 17 00:00:00 2001 From: nielstron Date: Mon, 12 Feb 2018 00:37:47 +0100 Subject: [PATCH 08/15] Delete precipitation expected.dialog --- dialog/it-it/precipitation expected.dialog | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 dialog/it-it/precipitation expected.dialog diff --git a/dialog/it-it/precipitation expected.dialog b/dialog/it-it/precipitation expected.dialog deleted file mode 100644 index 9d8dbd9d..00000000 --- a/dialog/it-it/precipitation expected.dialog +++ /dev/null @@ -1,2 +0,0 @@ -{{modifier}} {{precip}} è previsto per {{day}} -La previsione indica {{modifier}} {{precip}} per {{day}} From e33789894f537e863386250fc5648668fa3729e4 Mon Sep 17 00:00:00 2001 From: nielstron Date: Mon, 12 Feb 2018 00:38:15 +0100 Subject: [PATCH 09/15] Rename precipitatio.today.dialog to precipitation.today.dialog --- .../{precipitatio.today.dialog => precipitation.today.dialog} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dialog/it-it/{precipitatio.today.dialog => precipitation.today.dialog} (100%) diff --git a/dialog/it-it/precipitatio.today.dialog b/dialog/it-it/precipitation.today.dialog similarity index 100% rename from dialog/it-it/precipitatio.today.dialog rename to dialog/it-it/precipitation.today.dialog From f78bf527340e689d710d9fa421833ccf1e113cb5 Mon Sep 17 00:00:00 2001 From: nielstron Date: Mon, 12 Feb 2018 00:39:15 +0100 Subject: [PATCH 10/15] Rename precipitatio.expected.dialog to precipitation.expected.dialog --- ...precipitatio.expected.dialog => precipitation.expected.dialog} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dialog/it-it/{precipitatio.expected.dialog => precipitation.expected.dialog} (100%) diff --git a/dialog/it-it/precipitatio.expected.dialog b/dialog/it-it/precipitation.expected.dialog similarity index 100% rename from dialog/it-it/precipitatio.expected.dialog rename to dialog/it-it/precipitation.expected.dialog From 15687e368ba657ab0d577b334ad33efaa65e8337 Mon Sep 17 00:00:00 2001 From: nielstron Date: Mon, 12 Feb 2018 01:12:22 +0100 Subject: [PATCH 11/15] Taking care of the location in rain/snow requests Also refactored the request overall procedure. Now there is a seperate function to determine which dialog to choose --- __init__.py | 54 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/__init__.py b/__init__.py index 0e609db5..7680102f 100644 --- a/__init__.py +++ b/__init__.py @@ -231,9 +231,16 @@ def handle_next_precipitation(self, message): today = extract_datetime(" ")[0] # this is None when = extract_datetime(message.data.get('utterance'))[0] if today == when: - forecasting = 'today' + timeframe = 'today' else: - forecasting = 'expected' + timeframe = 'expected' + + data = { + "modifier": "", + "precip": "none", + "day": self.__to_day(when), + "location" : report['location'] + } # search the forecast for precipitation for weather in self.owm.daily_forecast( @@ -242,8 +249,8 @@ def handle_next_precipitation(self, message): report['lon']).get_forecast().get_weathers(): forecastDate = datetime.fromtimestamp(weather.get_reference_time()) - - # TODO: "will it rain tomorrow" returns forecast for today, if it rains today + + # TODO: "will it rain tomorrow" returns forecast for today, if it rains today if when != today: # User asked about a specific date, is this it? whenGMT = self.__to_GMT(when) @@ -252,35 +259,27 @@ def handle_next_precipitation(self, message): rain = weather.get_rain() if rain and rain["all"] > 0: - data = { - "modifier": "", - "precip": "rain", - "day": self.__to_day(forecastDate) - } + data["precip"] = "rain" + data["day"] = self.__to_day(forecastDate) if rain["all"] < 10: data["modifier"] = self.__translate("light") elif rain["all"] > 20: data["modifier"] = self.__translate("heavy") - self.speak_dialog("precipitation." + forecasting, data) - return + break snow = weather.get_snow() if snow and snow["all"] > 0: - data = { - "modifier": "", - "precip": "snow", - "day": self.__to_day(forecastDate) - } + data["precip"] = "snow" + data["day"] = self.__to_day(forecastDate) if snow["all"] < 10: data["modifier"] = self.__translate("light") elif snow["all"] > 20: data["modifier"] = self.__translate("heavy") - self.speak_dialog("precipitation." + forecasting, data) - return - - self.speak_dialog("precipitation.not_expected", report) + break + + self.__report_precipitation(timeframe, data) # Handle: What's the weather later? @intent_handler(IntentBuilder("NextHoursWeatherIntent").require( @@ -492,6 +491,21 @@ def __initialize_report(self, message): 'full_location': location, 'scale': self.__get_temperature_unit() } + + def __report_precipitation(self, timeframe, data): + if data['precip'] == "none": + expected = ".not_expected" + elif timeframe == "today": + expected = ".today" + else: + expected = ".expected" + + if data['location'] == self.location_pretty: + local = ".local" + else: + local = "" + + self.speak_dialog("precipitation" + expected + local, data) def __report_weather(self, timeframe, report): # Tell the weather to the user (verbal and visual) From b6fee2af67e829dc5423f14ad2c839eaf931d9b4 Mon Sep 17 00:00:00 2001 From: nielstron Date: Mon, 12 Feb 2018 01:13:43 +0100 Subject: [PATCH 12/15] Patched rain/snow dialog files --- dialog/de-de/precipitation.expected.dialog | 4 ++-- dialog/de-de/precipitation.expected.local.dialog | 2 ++ dialog/de-de/precipitation.not_expected.dialog | 6 +++--- dialog/de-de/precipitation.not_expected.local.dialog | 4 ++++ dialog/de-de/precipitation.today.dialog | 4 ++-- dialog/de-de/precipitation.today.local.dialog | 2 ++ 6 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 dialog/de-de/precipitation.expected.local.dialog create mode 100644 dialog/de-de/precipitation.not_expected.local.dialog create mode 100644 dialog/de-de/precipitation.today.local.dialog diff --git a/dialog/de-de/precipitation.expected.dialog b/dialog/de-de/precipitation.expected.dialog index 32df0aae..2a5c430e 100644 --- a/dialog/de-de/precipitation.expected.dialog +++ b/dialog/de-de/precipitation.expected.dialog @@ -1,2 +1,2 @@ -{{modifier}} {{precip}} wird am {{day}} erwartet -Die Vorhersage nennt {{modifier}} {{precip}} am {{day}} +{{modifier}} {{precip}} wird am {{day}} in {{location}} erwartet +Die Vorhersage nennt {{modifier}} {{precip}} am {{day}} in {{location}} diff --git a/dialog/de-de/precipitation.expected.local.dialog b/dialog/de-de/precipitation.expected.local.dialog new file mode 100644 index 00000000..32df0aae --- /dev/null +++ b/dialog/de-de/precipitation.expected.local.dialog @@ -0,0 +1,2 @@ +{{modifier}} {{precip}} wird am {{day}} erwartet +Die Vorhersage nennt {{modifier}} {{precip}} am {{day}} diff --git a/dialog/de-de/precipitation.not_expected.dialog b/dialog/de-de/precipitation.not_expected.dialog index 5cf86fa3..1a9377e7 100644 --- a/dialog/de-de/precipitation.not_expected.dialog +++ b/dialog/de-de/precipitation.not_expected.dialog @@ -1,4 +1,4 @@ -es wird kein Niederschlag erwartet -es wird nicht Regnen oder scheien -du brauchst keinen Regenschirm mitnehmen +es wird kein Niederschlag in {{location}} erwartet +es wird nicht in {{location}} Regnen oder scheien +du brauchst nach {{location}} keinen Regenschirm mitnehmen diff --git a/dialog/de-de/precipitation.not_expected.local.dialog b/dialog/de-de/precipitation.not_expected.local.dialog new file mode 100644 index 00000000..5cf86fa3 --- /dev/null +++ b/dialog/de-de/precipitation.not_expected.local.dialog @@ -0,0 +1,4 @@ +es wird kein Niederschlag erwartet +es wird nicht Regnen oder scheien +du brauchst keinen Regenschirm mitnehmen + diff --git a/dialog/de-de/precipitation.today.dialog b/dialog/de-de/precipitation.today.dialog index bc378319..3bbf1dc3 100644 --- a/dialog/de-de/precipitation.today.dialog +++ b/dialog/de-de/precipitation.today.dialog @@ -1,2 +1,2 @@ -{{modifier}} {{precip}} ist heute zu erwarten -Heute fällt {{modifier}} {{precip}} +{{modifier}} {{precip}} ist heute in {{location}} zu erwarten +Heute fällt in {{location}} {{modifier}} {{precip}} diff --git a/dialog/de-de/precipitation.today.local.dialog b/dialog/de-de/precipitation.today.local.dialog new file mode 100644 index 00000000..bc378319 --- /dev/null +++ b/dialog/de-de/precipitation.today.local.dialog @@ -0,0 +1,2 @@ +{{modifier}} {{precip}} ist heute zu erwarten +Heute fällt {{modifier}} {{precip}} From 3c4bd38a5bb98112da077caaa4b951faa8a812b8 Mon Sep 17 00:00:00 2001 From: nielstron Date: Mon, 12 Feb 2018 01:14:43 +0100 Subject: [PATCH 13/15] Patched rain/snow dialogs --- dialog/en-us/precipitation.expected.dialog | 5 +++-- dialog/en-us/precipitation.expected.local.dialog | 2 ++ dialog/en-us/precipitation.not_expected.dialog | 4 ++-- dialog/en-us/precipitation.not_expected.local.dialog | 2 ++ dialog/en-us/precipitation.today.dialog | 4 ++-- dialog/en-us/precipitation.today.local.dialog | 2 ++ 6 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 dialog/en-us/precipitation.expected.local.dialog create mode 100644 dialog/en-us/precipitation.not_expected.local.dialog create mode 100644 dialog/en-us/precipitation.today.local.dialog diff --git a/dialog/en-us/precipitation.expected.dialog b/dialog/en-us/precipitation.expected.dialog index 08aad1d7..22ab2408 100644 --- a/dialog/en-us/precipitation.expected.dialog +++ b/dialog/en-us/precipitation.expected.dialog @@ -1,2 +1,3 @@ -{{modifier}} {{precip}} is expected on {{day}} -The forecast calls for {{modifier}} {{precip}} on {{day}} +{{modifier}} {{precip}} is expected in {{location}} on {{day}} +{{modifier}} {{precip}} is expected on {{day}} for {{location}} +The forecast calls for {{modifier}} {{precip}} on {{day}} for {{location}} diff --git a/dialog/en-us/precipitation.expected.local.dialog b/dialog/en-us/precipitation.expected.local.dialog new file mode 100644 index 00000000..08aad1d7 --- /dev/null +++ b/dialog/en-us/precipitation.expected.local.dialog @@ -0,0 +1,2 @@ +{{modifier}} {{precip}} is expected on {{day}} +The forecast calls for {{modifier}} {{precip}} on {{day}} diff --git a/dialog/en-us/precipitation.not_expected.dialog b/dialog/en-us/precipitation.not_expected.dialog index 6ccf889a..bbb37a78 100644 --- a/dialog/en-us/precipitation.not_expected.dialog +++ b/dialog/en-us/precipitation.not_expected.dialog @@ -1,2 +1,2 @@ -No precipitation is in the forecast -None is forecasted +No precipitation is in the forecast for {{location}} +None is forecasted for {{location}} diff --git a/dialog/en-us/precipitation.not_expected.local.dialog b/dialog/en-us/precipitation.not_expected.local.dialog new file mode 100644 index 00000000..6ccf889a --- /dev/null +++ b/dialog/en-us/precipitation.not_expected.local.dialog @@ -0,0 +1,2 @@ +No precipitation is in the forecast +None is forecasted diff --git a/dialog/en-us/precipitation.today.dialog b/dialog/en-us/precipitation.today.dialog index 88a3f156..c246c3bd 100644 --- a/dialog/en-us/precipitation.today.dialog +++ b/dialog/en-us/precipitation.today.dialog @@ -1,2 +1,2 @@ -Currently there is {{modifier}} {{precip}} -Today there is {{modifier}} {{precip}} +Currently there is {{modifier}} {{precip}} in {{location}} +Today there is {{modifier}} {{precip}} in {{location}} diff --git a/dialog/en-us/precipitation.today.local.dialog b/dialog/en-us/precipitation.today.local.dialog new file mode 100644 index 00000000..88a3f156 --- /dev/null +++ b/dialog/en-us/precipitation.today.local.dialog @@ -0,0 +1,2 @@ +Currently there is {{modifier}} {{precip}} +Today there is {{modifier}} {{precip}} From 17e78186cb85215b7717defb649d319684f71718 Mon Sep 17 00:00:00 2001 From: nielstron Date: Mon, 12 Feb 2018 01:15:10 +0100 Subject: [PATCH 14/15] Patched snow/rain dialogs --- dialog/it-it/precipitatio.expected.dialog | 2 ++ dialog/it-it/precipitatio.expected.local.dialog | 2 ++ dialog/it-it/precipitatio.today.dialog | 2 ++ dialog/it-it/precipitatio.today.local.dialog | 2 ++ dialog/it-it/precipitation.not_expected.local.dialog | 1 + 5 files changed, 9 insertions(+) create mode 100644 dialog/it-it/precipitatio.expected.dialog create mode 100644 dialog/it-it/precipitatio.expected.local.dialog create mode 100644 dialog/it-it/precipitatio.today.dialog create mode 100644 dialog/it-it/precipitatio.today.local.dialog create mode 100644 dialog/it-it/precipitation.not_expected.local.dialog diff --git a/dialog/it-it/precipitatio.expected.dialog b/dialog/it-it/precipitatio.expected.dialog new file mode 100644 index 00000000..9d8dbd9d --- /dev/null +++ b/dialog/it-it/precipitatio.expected.dialog @@ -0,0 +1,2 @@ +{{modifier}} {{precip}} è previsto per {{day}} +La previsione indica {{modifier}} {{precip}} per {{day}} diff --git a/dialog/it-it/precipitatio.expected.local.dialog b/dialog/it-it/precipitatio.expected.local.dialog new file mode 100644 index 00000000..9d8dbd9d --- /dev/null +++ b/dialog/it-it/precipitatio.expected.local.dialog @@ -0,0 +1,2 @@ +{{modifier}} {{precip}} è previsto per {{day}} +La previsione indica {{modifier}} {{precip}} per {{day}} diff --git a/dialog/it-it/precipitatio.today.dialog b/dialog/it-it/precipitatio.today.dialog new file mode 100644 index 00000000..0b655d41 --- /dev/null +++ b/dialog/it-it/precipitatio.today.dialog @@ -0,0 +1,2 @@ +{{modifier}} {{precip}} è previsto +La previsione indica {{modifier}} {{precip}} diff --git a/dialog/it-it/precipitatio.today.local.dialog b/dialog/it-it/precipitatio.today.local.dialog new file mode 100644 index 00000000..0b655d41 --- /dev/null +++ b/dialog/it-it/precipitatio.today.local.dialog @@ -0,0 +1,2 @@ +{{modifier}} {{precip}} è previsto +La previsione indica {{modifier}} {{precip}} diff --git a/dialog/it-it/precipitation.not_expected.local.dialog b/dialog/it-it/precipitation.not_expected.local.dialog new file mode 100644 index 00000000..08409ceb --- /dev/null +++ b/dialog/it-it/precipitation.not_expected.local.dialog @@ -0,0 +1 @@ +Nessuna precipitazione nelle previsioni From 8a11bae22dbd14abfc72ef2763ca684f624f668b Mon Sep 17 00:00:00 2001 From: nielstron Date: Mon, 12 Feb 2018 01:21:06 +0100 Subject: [PATCH 15/15] Local dialog may also reference the location --- dialog/en-us/precipitation.expected.local.dialog | 3 +++ dialog/en-us/precipitation.not_expected.local.dialog | 2 ++ dialog/en-us/precipitation.today.local.dialog | 2 ++ 3 files changed, 7 insertions(+) diff --git a/dialog/en-us/precipitation.expected.local.dialog b/dialog/en-us/precipitation.expected.local.dialog index 08aad1d7..8df760fe 100644 --- a/dialog/en-us/precipitation.expected.local.dialog +++ b/dialog/en-us/precipitation.expected.local.dialog @@ -1,2 +1,5 @@ {{modifier}} {{precip}} is expected on {{day}} The forecast calls for {{modifier}} {{precip}} on {{day}} +{{modifier}} {{precip}} is expected in {{location}} on {{day}} +{{modifier}} {{precip}} is expected on {{day}} for {{location}} +The forecast calls for {{modifier}} {{precip}} on {{day}} for {{location}} diff --git a/dialog/en-us/precipitation.not_expected.local.dialog b/dialog/en-us/precipitation.not_expected.local.dialog index 6ccf889a..16e940c2 100644 --- a/dialog/en-us/precipitation.not_expected.local.dialog +++ b/dialog/en-us/precipitation.not_expected.local.dialog @@ -1,2 +1,4 @@ No precipitation is in the forecast None is forecasted +No precipitation is in the forecast for {{location}} +None is forecasted for {{location}} \ No newline at end of file diff --git a/dialog/en-us/precipitation.today.local.dialog b/dialog/en-us/precipitation.today.local.dialog index 88a3f156..d201108d 100644 --- a/dialog/en-us/precipitation.today.local.dialog +++ b/dialog/en-us/precipitation.today.local.dialog @@ -1,2 +1,4 @@ Currently there is {{modifier}} {{precip}} Today there is {{modifier}} {{precip}} +Currently there is {{modifier}} {{precip}} in {{location}} +Today there is {{modifier}} {{precip}} in {{location}} \ No newline at end of file