Merge pull request #2 from nielstron/nielstron-patch-2

Taking care of locations in precipitation requests

Author: nielstron

__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)

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}}

dialog/de-de/precipitation.expected.local.dialog

@@ -0,0 +1,2 @@
+{{modifier}} {{precip}} wird am {{day}} erwartet
+Die Vorhersage nennt {{modifier}} {{precip}} am {{day}}

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
 

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
+

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}}

dialog/de-de/precipitation.today.local.dialog

@@ -0,0 +1,2 @@
+{{modifier}} {{precip}} ist heute zu erwarten
+Heute fällt {{modifier}} {{precip}}

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}}

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}}

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}}

dialog/en-us/precipitation.not_expected.local.dialog

@@ -0,0 +1,2 @@
+No precipitation is in the forecast
+None is forecasted

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}} 

dialog/en-us/precipitation.today.local.dialog

@@ -0,0 +1,2 @@
+Currently there is {{modifier}} {{precip}}
+Today there is {{modifier}} {{precip}}

dialog/it-it/precipitatio.expected.dialog

@@ -0,0 +1,2 @@
+{{modifier}} {{precip}} è previsto per {{day}}
+La previsione indica {{modifier}} {{precip}} per {{day}}

dialog/it-it/precipitatio.expected.local.dialog

@@ -0,0 +1,2 @@
+{{modifier}} {{precip}} è previsto per {{day}}
+La previsione indica {{modifier}} {{precip}} per {{day}}

dialog/it-it/precipitatio.today.dialog

@@ -0,0 +1,2 @@
+{{modifier}} {{precip}} è previsto
+La previsione indica {{modifier}} {{precip}}

dialog/it-it/precipitatio.today.local.dialog

@@ -0,0 +1,2 @@
+{{modifier}} {{precip}} è previsto
+La previsione indica {{modifier}} {{precip}}

dialog/it-it/precipitation.not_expected.local.dialog

@@ -0,0 +1 @@
+Nessuna precipitazione nelle previsioni