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
MythTV · Nov 29, 2010 · f1831b2 · f1831b2
1 parent 549fca1
commit f1831b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl b/mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl
@@ -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 ||

diff --git a/mythplugins/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl b/mythplugins/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl
@@ -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 ||