Permalink
Browse files

Backport [27337] to 0.24-fixes. Deal with an optional 's' in the BBC …

…weather grabber when parsing strings like 'light snow shower(s)'.

git-svn-id: http://svn.mythtv.org/svn/branches/release-0-24-fixes@27371 7dbf422c-18fa-0310-86e9-fd20926502f2
  • Loading branch information...
1 parent 549fca1 commit f1831b27d168234a268ae2b784d560dcc094908f @stuartm stuartm committed Nov 29, 2010
@@ -154,14 +154,14 @@
}
elsif ($weather_string =~ /^thundery rain$/i ||
$weather_string =~ /^thunder storm$/i ||
- $weather_string =~ /^thundery showers$/i) {
+ $weather_string =~ /^thundery showers?$/i) {
printf "weather_icon::thunshowers.png\n";
}
elsif ($weather_string =~ /^heavy snow$/i) {
printf "weather_icon::snowshow.png\n";
}
elsif ($weather_string =~ /^light snow$/i ||
- $weather_string =~ /^light snow showers$/i) {
+ $weather_string =~ /^light snow showers?$/i) {
printf "weather_icon::flurries.png\n";
}
elsif ($weather_string =~ /^sleet$/i ||
@@ -179,14 +179,14 @@
}
elsif ($weather_string =~ /^thundery rain$/i ||
$weather_string =~ /^thunder storm$/i ||
- $weather_string =~ /^thundery showers$/i) {
+ $weather_string =~ /^thundery showers?$/i) {
printf "icon-" . $i . "::thunshowers.png\n";
}
elsif ($weather_string =~ /^heavy snow$/i) {
printf "icon-" . $i . "::snowshow.png\n";
}
elsif ($weather_string =~ /^light snow$/i ||
- $weather_string =~ /^light snow showers$/i) {
+ $weather_string =~ /^light snow showers?$/i) {
printf "icon-" . $i . "::flurries.png\n";
}
elsif ($weather_string =~ /^sleet$/i ||

0 comments on commit f1831b2

Please sign in to comment.