From 609ac50bd1c44bc1d7db0a7d6711d4a54325c7b8 Mon Sep 17 00:00:00 2001 From: Aiden Date: Mon, 30 Aug 2021 01:01:38 +0100 Subject: [PATCH 1/3] FIX GRAMMATICAL ERROR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit it should be `0 seconds` not `0 second` i cannot believe you did this ❗ ❗ --- time.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/time.go b/time.go index 7e7a8ea..d051cfe 100644 --- a/time.go +++ b/time.go @@ -61,7 +61,7 @@ func CustomDurationString(diff time.Duration, numParts int, glue string) string } if value > 0 { part := fmt.Sprintf("%d %s", value, mag.Name) - if value > 1 { + if value != 1 { part += "s" } From b56641af13fb2044d1ad0e83d631a7c9522bcadd Mon Sep 17 00:00:00 2001 From: Aiden Date: Sat, 2 Oct 2021 22:07:25 +0100 Subject: [PATCH 2/3] Update time.go --- time.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/time.go b/time.go index d051cfe..3dd4ef1 100644 --- a/time.go +++ b/time.go @@ -61,7 +61,7 @@ func CustomDurationString(diff time.Duration, numParts int, glue string) string } if value > 0 { part := fmt.Sprintf("%d %s", value, mag.Name) - if value != 1 { + if !(value == 1 || value = -1) { part += "s" } From 1d1185523f739781f16f80d98df0ef42a5009e5d Mon Sep 17 00:00:00 2001 From: Aiden Date: Sat, 2 Oct 2021 22:09:20 +0100 Subject: [PATCH 3/3] sike thats the wrong number! get it because it's about numbers haha im so quirky and original xD --- time.go | 2 +- time_test.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/time.go b/time.go index 3dd4ef1..d995e4e 100644 --- a/time.go +++ b/time.go @@ -61,7 +61,7 @@ func CustomDurationString(diff time.Duration, numParts int, glue string) string } if value > 0 { part := fmt.Sprintf("%d %s", value, mag.Name) - if !(value == 1 || value = -1) { + if !(value == 1 || value == -1) { part += "s" } diff --git a/time_test.go b/time_test.go index bb4c0b1..b197fd4 100644 --- a/time_test.go +++ b/time_test.go @@ -109,6 +109,10 @@ func TestCustomRelTime(t *testing.T) { t2, _ = time.Parse(timeFormat, "Mon Jan 3 15:00:02.000") testCustomRelTime(t, t1, t2, 3, " ", "4 minutes 3 seconds") + t1, _ = time.Parse(timeFormat, "Mon Jan 3 15:04:05.000") + t2, _ = time.Parse(timeFormat, "Mon Jan 3 15:00:04.000") + testCustomRelTime(t, t1, t2, 3, " ", "4 minutes 1 second") + t1, _ = time.Parse(timeFormat, "Mon Jan 3 15:04:05.000") t2, _ = time.Parse(timeFormat, "Mon Jan 3 15:00:02.001") testCustomRelTime(t, t1, t2, 3, " ", "4 minutes 2 seconds")