[Rt-commit] rt branch, 4.2/charts, updated. rt-4.1.8-494-gb0c5f30

[Ruslan Zakirov]

The branch, 4.2/charts has been updated
       via  b0c5f306180bc4fef32c583cf4532454cf1beacc (commit)
      from  0c5b0d5309250adf25ec01e0d0fecedb13bb26a6 (commit)

Summary of changes:
 lib/RT/Date.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit b0c5f306180bc4fef32c583cf4532454cf1beacc
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Jun 26 17:27:37 2013 +0400

    fixup c1ab6d8c93161511f13a599bc734f47b4cad6222

diff --git a/lib/RT/Date.pm b/lib/RT/Date.pm
index 306ab14..feb9ff1 100644
--- a/lib/RT/Date.pm
+++ b/lib/RT/Date.pm
@@ -372,8 +372,9 @@ sub DurationAsString {
     my $duration = int shift;
     my %args = ( Show => 1, Short => 0, @_ );
 
-    return $self->loc("0 seconds")
-        unless $duration;
+    unless ( $duration ) {
+        return $args{Short}? $self->loc("0s") : $self->loc("0 seconds");
+    }
 
     my $negative;
     $negative = 1 if $duration < 0;

-----------------------------------------------------------------------