From: Michael J. Rubinsky Date: Mon, 8 Jun 2009 18:20:58 +0000 (-0400) Subject: Add windgust X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=736b74fb2383b5d34fb4333a28056d4dea23f22e;p=horde.git Add windgust --- diff --git a/timeobjects/lib/Driver/Weatherdotcom.php b/timeobjects/lib/Driver/Weatherdotcom.php index edae98eaa..c3e2e2163 100644 --- a/timeobjects/lib/Driver/Weatherdotcom.php +++ b/timeobjects/lib/Driver/Weatherdotcom.php @@ -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'],