Ticket #8081: i18n_pretty_timedelta.patch

trac/util/datefmt.py

@@ -25 +25 @@
 
 from trac.core import TracError
 from trac.util.text import to_unicode
+from trac.util.translation import _, tag_, N_, gettext
 
 # Date/time utilities
 
@@ -72 +73 @@
     time2 = to_datetime(time2)
     if time1 > time2:
         time2, time1 = time1, time2
-    units = ((3600 * 24 * 365, 'year',   'years'),
-             (3600 * 24 * 30,  'month',  'months'),
-             (3600 * 24 * 7,   'week',   'weeks'),
-             (3600 * 24,       'day',    'days'),
-             (3600,            'hour',   'hours'),
-             (60,              'minute', 'minutes'))
+    units = ((3600 * 24 * 365, _('year'),   _('years')),
+             (3600 * 24 * 30,  _('month'),  _('months')),
+             (3600 * 24 * 7,   _('week'),   _('weeks')),
+             (3600 * 24,       _('day'),    _('days')),
+             (3600,            _('hour'),   _('hours')),
+             (60,              _('minute'), _('minutes')))
     diff = time2 - time1
     age_s = int(diff.days * 86400 + diff.seconds)
     if resolution and age_s < resolution:
         return ''
     if age_s <= 60 * 1.9:
-        return '%i second%s' % (age_s, age_s != 1 and 's' or '')
+        return '%i %s' % (age_s, age_s == 1 and _('second') or _('seconds'))
     for u, unit, unit_plural in units:
         r = float(age_s) / float(u)
         if r >= 1.9: