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

Proposed by Vadim Rutkovsky on 2011-12-10
Status: Needs review
Proposed branch: lp:~roignac/ubuntu/oneiric/indicator-weather/lp_886028
Merge into: lp:ubuntu/oneiric/indicator-weather
Diff against target: 14 lines (+1/-3)
1 file modified
bin/indicator-weather (+1/-3)
To merge this branch: bzr merge lp:~roignac/ubuntu/oneiric/indicator-weather/lp_886028
Reviewer Review Type Date Requested Status
Andrew Starr-Bochicchio 2011-12-10 Pending
Review via email: mp+85219@code.launchpad.net

Description of the change

Backporting the fix for bug #886026, which broke soem cities and forecasts

To post a comment you must log in.

Unmerged revisions

35. By Vadim Rutkovsky on 2011-12-10

Applied patch, which handles Unknown wind info correctly. Many thanks to Tomasz Maciejewski

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/indicator-weather'
2--- bin/indicator-weather 2011-07-12 01:44:53 +0000
3+++ bin/indicator-weather 2011-12-10 10:56:26 +0000
4@@ -833,9 +833,7 @@
5 wind_info = self.__report['current_conditions']['wind_condition'].split(' ')
6 wind_speed = wind_info[3]
7 else:
8- wind_direction = _("Unknown")
9- wind_info = _("Unknown")
10- wind_speed = _("Unknown")
11+ return _("Unknown")
12
13 if self.__weather_datasource == WeatherDataSource.YAHOO:
14 # Create a similar to Google wind_info structure from Yahoo data

Subscribers

People subscribed via source and target branches