From: Andrew Ruthven Date: Sat, 7 Jul 2012 02:10:18 +0000 (+1200) Subject: When stripping off "0 Minutes" take off the comma as well. X-Git-Tag: debian-sid-0.10.2-1~9 X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb19824480f6a6b511fe0aa6f8a1172edfb5ca72;p=mythtv-status.git When stripping off "0 Minutes" take off the comma as well. --- diff --git a/ChangeLog b/ChangeLog index 36b03dd..67ebe1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ don't report it as "1 Hour, 1 Minutes". Thank you to Julian Gilbey for the patch fixing this. + If the next recording is in $x Hours, 0 Minutes, remove the comma + as well, previously it was outputing "$x Hours,". + 2012-07-06 Andrew Ruthven Correctly handle UTF-8 in the output from MythTV. diff --git a/bin/mythtv-status b/bin/mythtv-status index 80e5336..17e6857 100755 --- a/bin/mythtv-status +++ b/bin/mythtv-status @@ -445,7 +445,7 @@ my @blocks = ( $str =~ s/\b1 (Hour|Minute)s/1 $1/g; $str =~ s/^0 Hours, //; - $str =~ s/ 0 Minutes//; + $str =~ s/, 0 Minutes//; if ($seconds <= $c->{'recording_in_warn'}) { $warn_present ||= 1;