From aa79c72ae04fe04d2569761f2b034662ffb78b90 Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Sun, 16 May 2010 02:24:05 +0200 Subject: [PATCH] Finally fixed pluralization of timedelta formatting --- flask_website/utils.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/flask_website/utils.py b/flask_website/utils.py index 7d71348b..19d24d6c 100644 --- a/flask_website/utils.py +++ b/flask_website/utils.py @@ -127,10 +127,9 @@ def format_timedelta(delta, granularity='second', threshold=.85): if value >= threshold or unit == granularity: if unit == granularity and value > 0: value = max(1, value) - value = unicode(int(round(value))) - value += u' ' + unit - if value != u'1': - value += u's' - return value - + value = int(round(value)) + rv = u'%s %s' % (value, unit) + if value != 1: + rv += u's' + return rv return u''