Merge lp:~roignac/ubuntu/oneiric/indicator-weather/lp_838369 into lp:ubuntu/oneiric/indicator-weather

[Vadim Rutkovsky]

Backporting the fix for bug #838369 - show degrees when displaying wind direction where available

Unmerged revisions

35. By Vadim Rutkovsky on 2011-12-10

Show degrees in wind direction for Yahoo

=== modified file 'bin/indicator-weather'
--- bin/indicator-weather	2011-07-12 01:44:53 +0000
+++ bin/indicator-weather	2011-12-10 11:01:27 +0000
@@ -839,10 +839,10 @@
 
         if self.__weather_datasource == WeatherDataSource.YAHOO:
             # Create a similar to Google wind_info structure from Yahoo data
-            wind_direction = self.__localized_report['wind']['direction']
+            wind_direction = "%s (%s˚)" % (self.get_wind_direction(self.__localized_report['wind']['direction']), self.__localized_report['wind']['direction'])
             wind_speed = self.__localized_report['wind']['speed']
             wind_units = self.__localized_report['units']['speed']
-            localized_wind_info = [_("Wind") + ":", self.get_wind_direction(wind_direction), ',', wind_speed, wind_units] 
+            localized_wind_info = [_("Wind") + ":", wind_direction, wind_speed, wind_units] 
 
         # Parse Wind_direction - convert to selected scale
         if (self._wind_unit == WindUnits.MPH):
@@ -865,7 +865,8 @@
         localized_wind_info[len(localized_wind_info)-1] = _unit
         localized_wind_info[len(localized_wind_info)-2] = \
             NumberFormatter.format_float(_value, 1)
-        return ' '.join(localized_wind_info)
+        return "%s %s %s %s" % (localized_wind_info[0], localized_wind_info[1], \
+            localized_wind_info[2], localized_wind_info[3])
 
     # Get sunrise label
     def get_sunrise_label(self):