Fix display since time round

Author: lunny

modules/timeutil/since.go

@@ -7,6 +7,7 @@ package timeutil
 import (
 	"fmt"
 	"html/template"
+	"math"
 	"strings"
 	"time"
 
@@ -21,10 +22,14 @@ const (
 	Hour   = 60 * Minute
 	Day    = 24 * Hour
 	Week   = 7 * Day
-	Month  = 30 * Day
-	Year   = 12 * Month
+	Year   = 365*Day + 5*Hour + 48*Minute + 46 // 365d5h48m46s ref. https://pumas.nasa.gov/files/04_21_97_1.pdf
+	Month  = Year / 12
 )
 
+func round(s float64) int64 {
+	return int64(math.Round(s))
+}
+
 func computeTimeDiff(diff int64, lang string) (int64, string) {
 	diffStr := ""
 	switch {
@@ -38,46 +43,76 @@ func computeTimeDiff(diff int64, lang string) (int64, string) {
 		diffStr = i18n.Tr(lang, "tool.seconds", diff)
 		diff = 0
 
-	case diff < 2*Minute:
+	case diff < Minute+Minute/2:
 		diff -= 1 * Minute
 		diffStr = i18n.Tr(lang, "tool.1m")
 	case diff < 1*Hour:
-		diffStr = i18n.Tr(lang, "tool.minutes", diff/Minute)
+		minutes := round(float64(diff) / Minute)
+		if minutes > 1 {
+			diffStr = i18n.Tr(lang, "tool.minutes", minutes)
+		} else {
+			diffStr = i18n.Tr(lang, "tool.1m")
+		}
 		diff -= diff / Minute * Minute
 
-	case diff < 2*Hour:
+	case diff < Hour+Hour/2:
 		diff -= 1 * Hour
 		diffStr = i18n.Tr(lang, "tool.1h")
 	case diff < 1*Day:
-		diffStr = i18n.Tr(lang, "tool.hours", diff/Hour)
+		hours := round(float64(diff) / Hour)
+		if hours > 1 {
+			diffStr = i18n.Tr(lang, "tool.hours", hours)
+		} else {
+			diffStr = i18n.Tr(lang, "tool.1h")
+		}
 		diff -= diff / Hour * Hour
 
-	case diff < 2*Day:
+	case diff < Day+Day/2:
 		diff -= 1 * Day
 		diffStr = i18n.Tr(lang, "tool.1d")
 	case diff < 1*Week:
-		diffStr = i18n.Tr(lang, "tool.days", diff/Day)
+		days := round(float64(diff) / Day)
+		if days > 1 {
+			diffStr = i18n.Tr(lang, "tool.days", days)
+		} else {
+			diffStr = i18n.Tr(lang, "tool.1d")
+		}
 		diff -= diff / Day * Day
 
-	case diff < 2*Week:
+	case diff < Week+Week/2:
 		diff -= 1 * Week
 		diffStr = i18n.Tr(lang, "tool.1w")
 	case diff < 1*Month:
-		diffStr = i18n.Tr(lang, "tool.weeks", diff/Week)
+		weeks := round(float64(diff) / Week)
+		if weeks > 1 {
+			diffStr = i18n.Tr(lang, "tool.weeks", weeks)
+		} else {
+			diffStr = i18n.Tr(lang, "tool.1w")
+		}
 		diff -= diff / Week * Week
 
-	case diff < 2*Month:
+	case diff < 1*Month+Month/2:
 		diff -= 1 * Month
 		diffStr = i18n.Tr(lang, "tool.1mon")
 	case diff < 1*Year:
-		diffStr = i18n.Tr(lang, "tool.months", diff/Month)
+		months := round(float64(diff) / Month)
+		if months > 1 {
+			diffStr = i18n.Tr(lang, "tool.months", months)
+		} else {
+			diffStr = i18n.Tr(lang, "tool.1mon")
+		}
 		diff -= diff / Month * Month
 
-	case diff < 2*Year:
+	case diff < Year+Year/2:
 		diff -= 1 * Year
 		diffStr = i18n.Tr(lang, "tool.1y")
 	default:
-		diffStr = i18n.Tr(lang, "tool.years", diff/Year)
+		years := round(float64(diff) / Year)
+		if years > 1 {
+			diffStr = i18n.Tr(lang, "tool.years", years)
+		} else {
+			diffStr = i18n.Tr(lang, "tool.1y")
+		}
 		diff -= (diff / Year) * Year
 	}
 	return diff, diffStr

modules/timeutil/since_test.go

@@ -5,6 +5,7 @@
 package timeutil
 
 import (
+	"fmt"
 	"os"
 	"testing"
 	"time"
@@ -124,26 +125,35 @@ func TestComputeTimeDiff(t *testing.T) {
 	// computeTimeDiff(base + offset) == (offset, str)
 	test := func(base int64, str string, offsets ...int64) {
 		for _, offset := range offsets {
-			diff, diffStr := computeTimeDiff(base+offset, "en")
-			assert.Equal(t, offset, diff)
-			assert.Equal(t, str, diffStr)
+			t.Run(fmt.Sprintf("%s:%d", str, offset), func(t *testing.T) {
+				diff, diffStr := computeTimeDiff(base+offset, "en")
+				assert.Equal(t, offset, diff)
+				assert.Equal(t, str, diffStr)
+			})
 		}
 	}
 	test(0, "now", 0)
 	test(1, "1 second", 0)
 	test(2, "2 seconds", 0)
-	test(Minute, "1 minute", 0, 1, 30, Minute-1)
-	test(2*Minute, "2 minutes", 0, Minute-1)
-	test(Hour, "1 hour", 0, 1, Hour-1)
-	test(5*Hour, "5 hours", 0, Hour-1)
-	test(Day, "1 day", 0, 1, Day-1)
-	test(5*Day, "5 days", 0, Day-1)
-	test(Week, "1 week", 0, 1, Week-1)
-	test(3*Week, "3 weeks", 0, 4*Day+25000)
-	test(Month, "1 month", 0, 1, Month-1)
-	test(10*Month, "10 months", 0, Month-1)
-	test(Year, "1 year", 0, Year-1)
-	test(3*Year, "3 years", 0, Year-1)
+	test(Minute, "1 minute", 0, 1, 29)
+	test(Minute, "2 minutes", 30, Minute-1)
+	test(2*Minute, "2 minutes", 0, 29)
+	test(2*Minute, "3 minutes", 30, Minute-1)
+	test(Hour, "1 hour", 0, 1, 29*Minute)
+	test(Hour, "2 hours", 30*Minute, Hour-1)
+	test(5*Hour, "5 hours", 0, 29*Minute)
+	test(Day, "1 day", 0, 1, 11*Hour)
+	test(Day, "2 days", 12*Hour, Day-1)
+	test(5*Day, "5 days", 0, 11*Hour)
+	test(Week, "1 week", 0, 1, 3*Day)
+	test(Week, "2 weeks", 4*Day, Week-1)
+	test(3*Week, "3 weeks", 0, 3*Day)
+	test(Month, "1 month", 0, 1)
+	test(Month, "2 months", 16*Day, Month-1)
+	test(10*Month, "10 months", 0, 13*Day)
+	test(Year, "1 year", 0, 182*Day)
+	test(Year, "2 years", 184*Day, Year-1)
+	test(3*Year, "3 years", 0, 182*Day)
 }
 
 func TestMinutesToFriendly(t *testing.T) {