Add windgust
authorMichael J. Rubinsky <mrubinsk@horde.org>
Mon, 8 Jun 2009 18:20:58 +0000 (14:20 -0400)
committerMichael J. Rubinsky <mrubinsk@horde.org>
Mon, 8 Jun 2009 18:20:58 +0000 (14:20 -0400)
timeobjects/lib/Driver/Weatherdotcom.php

index edae98e..c3e2e21 100644 (file)
@@ -175,21 +175,28 @@ class TimeObjects_Driver_Weatherdotcom extends TimeObjects_Driver
                                              String::upper($units['temp']),
                                              $data['temperatureLow'],
                                              String::upper($units['temp']));
-            $daytime = sprintf(_("Conditions: %s\nHigh: %d%s\nPrecipitation: %d%%\nHumidity: %d%%\nWinds: From the %s at %s"),
+            $daytime = sprintf(_("Conditions: %s\nHigh: %d%s\nPrecipitation: %d%%\nHumidity: %d%%\nWinds: From the %s at %d%s"),
                            $data['day']['condition'],
                            $data['temperatureHigh'], String::upper($units['temp']),
                            $data['day']['precipitation'],
                            $data['day']['humidity'],
                            $data['day']['windDirection'],
-                           $data['day']['wind'] . String::upper($units['wind']));
-             $nighttime = sprintf(_("Conditions: %s\nLow: %d%s\nPrecipitation: %d%%\nHumidity: %d%%\nWinds: From the %s at %s"),
+                           $data['day']['wind'],
+                           String::upper($units['wind']));
+             if (!empty($data['day']['windGust']) && $data['day']['windgust'] > 0) {
+                 $daytime .= sprintf(_(" gusting %d%s"), $data['day']['windgust'], String::upper($units['wind']));
+             }
+             $nighttime = sprintf(_("Conditions: %s\nLow: %d%s\nPrecipitation: %d%%\nHumidity: %d%%\nWinds: From the %s at %d%s"),
                            $data['night']['condition'],
                            $data['temperatureLow'], String::upper($units['temp']),
                            $data['night']['precipitation'],
                            $data['night']['humidity'],
                            $data['night']['windDirection'],
-                           $data['night']['wind'] . String::upper($units['wind']));
-
+                           $data['night']['wind'],
+                           String::upper($units['wind']));
+             if (!empty($data['night']['windGust']) && $data['night']['windgust'] > 0) {
+                 $nighttime .= sprintf(_(" gusting %d%s"), $data['night']['windgust'], String::upper($units['wind']));
+             }
             $description = sprintf(_("Location: %s\nSunrise: %sAM Sunset: %sPM\n\nDay:\n%s\n\nEvening:\n%s"),
                                    $location['name'],
                                    $data['sunrise'],