Skip to content

Commit 6b65797

Browse files
lunnyzeripath
lunny
authored and
zeripath
committed
Fix display since time round (go-gitea#14226)
Backport go-gitea#14226 * Fix display since time round * Fix since time * Fix tests
1 parent d9d2e8f commit 6b65797

File tree

2 files changed

+152
-37
lines changed

2 files changed

+152
-37
lines changed

‎modules/timeutil/since.go

Lines changed: 95 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package timeutil
77
import (
88
"fmt"
99
"html/template"
10+
"math"
1011
"strings"
1112
"time"
1213

@@ -25,7 +26,11 @@ const (
2526
Year = 12 * Month
2627
)
2728

28-
func computeTimeDiff(diff int64, lang string) (int64, string) {
29+
func round(s float64) int64 {
30+
return int64(math.Round(s))
31+
}
32+
33+
func computeTimeDiffFloor(diff int64, lang string) (int64, string) {
2934
diffStr := ""
3035
switch {
3136
case diff <= 0:
@@ -83,6 +88,94 @@ func computeTimeDiff(diff int64, lang string) (int64, string) {
8388
return diff, diffStr
8489
}
8590

91+
func computeTimeDiff(diff int64, lang string) (int64, string) {
92+
diffStr := ""
93+
switch {
94+
case diff <= 0:
95+
diff = 0
96+
diffStr = i18n.Tr(lang, "tool.now")
97+
case diff < 2:
98+
diff = 0
99+
diffStr = i18n.Tr(lang, "tool.1s")
100+
case diff < 1*Minute:
101+
diffStr = i18n.Tr(lang, "tool.seconds", diff)
102+
diff = 0
103+
104+
case diff < Minute+Minute/2:
105+
diff -= 1 * Minute
106+
diffStr = i18n.Tr(lang, "tool.1m")
107+
case diff < 1*Hour:
108+
minutes := round(float64(diff) / Minute)
109+
if minutes > 1 {
110+
diffStr = i18n.Tr(lang, "tool.minutes", minutes)
111+
} else {
112+
diffStr = i18n.Tr(lang, "tool.1m")
113+
}
114+
diff -= diff / Minute * Minute
115+
116+
case diff < Hour+Hour/2:
117+
diff -= 1 * Hour
118+
diffStr = i18n.Tr(lang, "tool.1h")
119+
case diff < 1*Day:
120+
hours := round(float64(diff) / Hour)
121+
if hours > 1 {
122+
diffStr = i18n.Tr(lang, "tool.hours", hours)
123+
} else {
124+
diffStr = i18n.Tr(lang, "tool.1h")
125+
}
126+
diff -= diff / Hour * Hour
127+
128+
case diff < Day+Day/2:
129+
diff -= 1 * Day
130+
diffStr = i18n.Tr(lang, "tool.1d")
131+
case diff < 1*Week:
132+
days := round(float64(diff) / Day)
133+
if days > 1 {
134+
diffStr = i18n.Tr(lang, "tool.days", days)
135+
} else {
136+
diffStr = i18n.Tr(lang, "tool.1d")
137+
}
138+
diff -= diff / Day * Day
139+
140+
case diff < Week+Week/2:
141+
diff -= 1 * Week
142+
diffStr = i18n.Tr(lang, "tool.1w")
143+
case diff < 1*Month:
144+
weeks := round(float64(diff) / Week)
145+
if weeks > 1 {
146+
diffStr = i18n.Tr(lang, "tool.weeks", weeks)
147+
} else {
148+
diffStr = i18n.Tr(lang, "tool.1w")
149+
}
150+
diff -= diff / Week * Week
151+
152+
case diff < 1*Month+Month/2:
153+
diff -= 1 * Month
154+
diffStr = i18n.Tr(lang, "tool.1mon")
155+
case diff < 1*Year:
156+
months := round(float64(diff) / Month)
157+
if months > 1 {
158+
diffStr = i18n.Tr(lang, "tool.months", months)
159+
} else {
160+
diffStr = i18n.Tr(lang, "tool.1mon")
161+
}
162+
diff -= diff / Month * Month
163+
164+
case diff < Year+Year/2:
165+
diff -= 1 * Year
166+
diffStr = i18n.Tr(lang, "tool.1y")
167+
default:
168+
years := round(float64(diff) / Year)
169+
if years > 1 {
170+
diffStr = i18n.Tr(lang, "tool.years", years)
171+
} else {
172+
diffStr = i18n.Tr(lang, "tool.1y")
173+
}
174+
diff -= (diff / Year) * Year
175+
}
176+
return diff, diffStr
177+
}
178+
86179
// MinutesToFriendly returns a user friendly string with number of minutes
87180
// converted to hours and minutes.
88181
func MinutesToFriendly(minutes int, lang string) string {
@@ -111,7 +204,7 @@ func timeSincePro(then, now time.Time, lang string) string {
111204
break
112205
}
113206

114-
diff, diffStr = computeTimeDiff(diff, lang)
207+
diff, diffStr = computeTimeDiffFloor(diff, lang)
115208
timeStr += ", " + diffStr
116209
}
117210
return strings.TrimPrefix(timeStr, ", ")

‎modules/timeutil/since_test.go

Lines changed: 57 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package timeutil
66

77
import (
8+
"fmt"
89
"os"
910
"testing"
1011
"time"
@@ -47,27 +48,39 @@ func TestTimeSince(t *testing.T) {
4748

4849
// test that each diff in `diffs` yields the expected string
4950
test := func(expected string, diffs ...time.Duration) {
50-
for _, diff := range diffs {
51-
actual := timeSince(BaseDate, BaseDate.Add(diff), "en")
52-
assert.Equal(t, i18n.Tr("en", "tool.ago", expected), actual)
53-
actual = timeSince(BaseDate.Add(diff), BaseDate, "en")
54-
assert.Equal(t, i18n.Tr("en", "tool.from_now", expected), actual)
55-
}
51+
t.Run(expected, func(t *testing.T) {
52+
for _, diff := range diffs {
53+
actual := timeSince(BaseDate, BaseDate.Add(diff), "en")
54+
assert.Equal(t, i18n.Tr("en", "tool.ago", expected), actual)
55+
actual = timeSince(BaseDate.Add(diff), BaseDate, "en")
56+
assert.Equal(t, i18n.Tr("en", "tool.from_now", expected), actual)
57+
}
58+
})
5659
}
5760
test("1 second", time.Second, time.Second+50*time.Millisecond)
5861
test("2 seconds", 2*time.Second, 2*time.Second+50*time.Millisecond)
59-
test("1 minute", time.Minute, time.Minute+30*time.Second)
60-
test("2 minutes", 2*time.Minute, 2*time.Minute+30*time.Second)
61-
test("1 hour", time.Hour, time.Hour+30*time.Minute)
62-
test("2 hours", 2*time.Hour, 2*time.Hour+30*time.Minute)
63-
test("1 day", DayDur, DayDur+12*time.Hour)
64-
test("2 days", 2*DayDur, 2*DayDur+12*time.Hour)
62+
test("1 minute", time.Minute, time.Minute+29*time.Second)
63+
test("2 minutes", 2*time.Minute, time.Minute+30*time.Second)
64+
test("2 minutes", 2*time.Minute, 2*time.Minute+29*time.Second)
65+
test("1 hour", time.Hour, time.Hour+29*time.Minute)
66+
test("2 hours", 2*time.Hour, time.Hour+30*time.Minute)
67+
test("2 hours", 2*time.Hour, 2*time.Hour+29*time.Minute)
68+
test("3 hours", 3*time.Hour, 2*time.Hour+30*time.Minute)
69+
test("1 day", DayDur, DayDur+11*time.Hour)
70+
test("2 days", 2*DayDur, DayDur+12*time.Hour)
71+
test("2 days", 2*DayDur, 2*DayDur+11*time.Hour)
72+
test("3 days", 3*DayDur, 2*DayDur+12*time.Hour)
6573
test("1 week", WeekDur, WeekDur+3*DayDur)
74+
test("2 weeks", 2*WeekDur, WeekDur+4*DayDur)
6675
test("2 weeks", 2*WeekDur, 2*WeekDur+3*DayDur)
67-
test("1 month", MonthDur, MonthDur+15*DayDur)
68-
test("2 months", 2*MonthDur, 2*MonthDur+15*DayDur)
69-
test("1 year", YearDur, YearDur+6*MonthDur)
70-
test("2 years", 2*YearDur, 2*YearDur+6*MonthDur)
76+
test("3 weeks", 3*WeekDur, 2*WeekDur+4*DayDur)
77+
test("1 month", MonthDur, MonthDur+14*DayDur)
78+
test("2 months", 2*MonthDur, MonthDur+15*DayDur)
79+
test("2 months", 2*MonthDur, 2*MonthDur+14*DayDur)
80+
test("1 year", YearDur, YearDur+5*MonthDur)
81+
test("2 years", 2*YearDur, YearDur+6*MonthDur)
82+
test("2 years", 2*YearDur, 2*YearDur+5*MonthDur)
83+
test("3 years", 3*YearDur, 2*YearDur+6*MonthDur)
7184
}
7285

7386
func TestTimeSincePro(t *testing.T) {
@@ -114,38 +127,47 @@ func TestHtmlTimeSince(t *testing.T) {
114127
}
115128
test("1 second", time.Second)
116129
test("3 minutes", 3*time.Minute+5*time.Second)
117-
test("1 day", DayDur+18*time.Hour)
118-
test("1 week", WeekDur+6*DayDur)
119-
test("3 months", 3*MonthDur+3*WeekDur)
130+
test("1 day", DayDur+11*time.Hour)
131+
test("1 week", WeekDur+3*DayDur)
132+
test("3 months", 3*MonthDur+2*WeekDur)
120133
test("2 years", 2*YearDur)
121-
test("3 years", 3*YearDur+11*MonthDur+4*WeekDur)
134+
test("3 years", 2*YearDur+11*MonthDur+4*WeekDur)
122135
}
123136

124137
func TestComputeTimeDiff(t *testing.T) {
125138
// test that for each offset in offsets,
126139
// computeTimeDiff(base + offset) == (offset, str)
127140
test := func(base int64, str string, offsets ...int64) {
128141
for _, offset := range offsets {
129-
diff, diffStr := computeTimeDiff(base+offset, "en")
130-
assert.Equal(t, offset, diff)
131-
assert.Equal(t, str, diffStr)
142+
t.Run(fmt.Sprintf("%s:%d", str, offset), func(t *testing.T) {
143+
diff, diffStr := computeTimeDiff(base+offset, "en")
144+
assert.Equal(t, offset, diff)
145+
assert.Equal(t, str, diffStr)
146+
})
132147
}
133148
}
134149
test(0, "now", 0)
135150
test(1, "1 second", 0)
136151
test(2, "2 seconds", 0)
137-
test(Minute, "1 minute", 0, 1, 30, Minute-1)
138-
test(2*Minute, "2 minutes", 0, Minute-1)
139-
test(Hour, "1 hour", 0, 1, Hour-1)
140-
test(5*Hour, "5 hours", 0, Hour-1)
141-
test(Day, "1 day", 0, 1, Day-1)
142-
test(5*Day, "5 days", 0, Day-1)
143-
test(Week, "1 week", 0, 1, Week-1)
144-
test(3*Week, "3 weeks", 0, 4*Day+25000)
145-
test(Month, "1 month", 0, 1, Month-1)
146-
test(10*Month, "10 months", 0, Month-1)
147-
test(Year, "1 year", 0, Year-1)
148-
test(3*Year, "3 years", 0, Year-1)
152+
test(Minute, "1 minute", 0, 1, 29)
153+
test(Minute, "2 minutes", 30, Minute-1)
154+
test(2*Minute, "2 minutes", 0, 29)
155+
test(2*Minute, "3 minutes", 30, Minute-1)
156+
test(Hour, "1 hour", 0, 1, 29*Minute)
157+
test(Hour, "2 hours", 30*Minute, Hour-1)
158+
test(5*Hour, "5 hours", 0, 29*Minute)
159+
test(Day, "1 day", 0, 1, 11*Hour)
160+
test(Day, "2 days", 12*Hour, Day-1)
161+
test(5*Day, "5 days", 0, 11*Hour)
162+
test(Week, "1 week", 0, 1, 3*Day)
163+
test(Week, "2 weeks", 4*Day, Week-1)
164+
test(3*Week, "3 weeks", 0, 3*Day)
165+
test(Month, "1 month", 0, 1)
166+
test(Month, "2 months", 16*Day, Month-1)
167+
test(10*Month, "10 months", 0, 13*Day)
168+
test(Year, "1 year", 0, 179*Day)
169+
test(Year, "2 years", 180*Day, Year-1)
170+
test(3*Year, "3 years", 0, 179*Day)
149171
}
150172

151173
func TestMinutesToFriendly(t *testing.T) {

0 commit comments

Comments
 (0)