[PATCH 2 of 7] templatefilters: fix plural tricks
Martin Geisler
mg at daimi.au.dk
Fri Aug 22 10:16:12 CDT 2008
# HG changeset patch
# User Martin Geisler <mg at daimi.au.dk>
# Date 1219415582 -7200
# Node ID 26c77e43cff8a25d1cdf59e45717217bcf272527
# Parent 3bfdb29c19995acf3bcd06a9e8c13cf661d3a46d
templatefilters: fix plural tricks
diff -r 3bfdb29c1999 -r 26c77e43cff8 mercurial/templatefilters.py
--- a/mercurial/templatefilters.py Fri Aug 22 16:33:02 2008 +0200
+++ b/mercurial/templatefilters.py Fri Aug 22 16:33:02 2008 +0200
@@ -7,14 +7,15 @@
import cgi, re, os, time, urllib, textwrap
import util, templater
+from i18n import _
-agescales = [("second", 1),
- ("minute", 60),
- ("hour", 3600),
- ("day", 3600 * 24),
- ("week", 3600 * 24 * 7),
- ("month", 3600 * 24 * 30),
- ("year", 3600 * 24 * 365)]
+agescales = [((_("second"), _("seconds")), 1),
+ ((_("minute"), _("minutes")), 60),
+ ((_("hour"), _("hours")), 3600),
+ ((_("day"), _("days")), 3600 * 24),
+ ((_("week"), _("weeks")), 3600 * 24 * 7),
+ ((_("month"), _("months")), 3600 * 24 * 30),
+ ((_("year"), _("years")), 3600 * 24 * 365)]
agescales.reverse()
@@ -23,8 +24,8 @@
def plural(t, c):
if c == 1:
- return t
- return t + "s"
+ return t[0]
+ return t[1]
def fmt(t, c):
return "%d %s" % (c, plural(t, c))
More information about the Mercurial-devel
mailing list