From 7750ce5f604199f0c2095812822d6e0d307c00bf Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Fri, 12 Jun 2020 15:28:24 +0200 Subject: [PATCH] time: fix relative() --- vlib/time/time.v | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/vlib/time/time.v b/vlib/time/time.v index ed2c787a34..51bb1b6448 100644 --- a/vlib/time/time.v +++ b/vlib/time/time.v @@ -200,13 +200,25 @@ pub fn (t Time) relative() string { return '1m' } if secs < 3600 { - return '${secs/60} minutes ago' + m := secs/60 + if m == 1 { + return '1 minute ago' + } + return '$m minutes ago' } if secs < 3600 * 24 { - return '${secs/3600} hours ago' + h := secs/3600 + if h == 1 { + return '1 hour ago' + } + return '$h hours ago' } if secs < 3600 * 24 * 5 { - return '${secs/3600/24} days ago' + d:=secs/3600/24 + if d == 1 { + return '1 day ago' + } + return '$d days ago' } if secs > 3600 * 24 * 10000 { return ''