Hi,
resending a trivial patch for correcting the output of "1 seconds" to
"1 second" when using --date=relative. The original patch was sent
2010-04-21 07:31:00+0200. The patch is created against current master
(ec768ed5) and passes all tests.
>From ec768ed5659b0e0f91c98a01c981bc359153a7b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20A.=20Holm?= <sunny@xxxxxxxxxxx>
Date: Wed, 21 Apr 2010 06:21:06 +0200
Subject: [PATCH] date.c: print "1 second ago", not "1 seconds ago"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
When using --date=relative, print "1 second ago" instead of "1 seconds
ago".
t0006: Add tests for 0, 1 and 2 seconds ago, to ensure that
--date=relative prints "1 second ago" and "x seconds ago" when x != 1.
Signed-off-by: Øyvind A. Holm <sunny@xxxxxxxxxxx>
---
date.c | 3 ++-
t/t0006-date.sh | 4 ++++
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/date.c b/date.c
index 002aa3c..6aec22b 100644
--- a/date.c
+++ b/date.c
@@ -96,7 +96,8 @@ const char *show_date_relative(unsigned long time, int tz,
return "in the future";
diff = now->tv_sec - time;
if (diff < 90) {
- snprintf(timebuf, timebuf_size, "%lu seconds ago", diff);
+ snprintf(timebuf, timebuf_size, "%lu second%s ago",
+ diff, (diff != 1 ? "s" : ""));
return timebuf;
}
/* Turn it into minutes */
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index 75b02af..3069545 100755
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -15,6 +15,9 @@ check_show() {
"
}
+check_show 0 '0 seconds ago'
+check_show 1 '1 second ago'
+check_show 2 '2 seconds ago'
check_show 5 '5 seconds ago'
check_show 300 '5 minutes ago'
check_show 18000 '5 hours ago'
@@ -48,6 +51,7 @@ check_approxidate() {
}
check_approxidate now '2009-08-30 19:20:00'
+check_approxidate '1 second ago' '2009-08-30 19:19:59'
check_approxidate '5 seconds ago' '2009-08-30 19:19:55'
check_approxidate 5.seconds.ago '2009-08-30 19:19:55'
check_approxidate 10.minutes.ago '2009-08-30 19:10:00'
--
1.7.1.11.g3bf78
Regards,
Øyvind A. Holm
(sunny256)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html