oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-11 17:51:01 +00:00
Code Wiki Activity

Make use of printer.Print when possible

Browse source
This commit is contained in:
jvoisin 2024-02-27 17:19:38 +01:00 • committed by Frédéric Guillot
parent b4ed17fbac
commit 5a7d6f8997
8 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/template/functions.go
View file

@ -180,13 +180,13 @@ func durationImpl(t time.Time, now time.Time) string {
func elapsedTime(printer *locale.Printer, tz string, t time.Time) string {
if t.IsZero() {
return printer.Printf("time_elapsed.not_yet")
return printer.Print("time_elapsed.not_yet")
}
now := timezone.Now(tz)
t = timezone.Convert(tz, t)
if now.Before(t) {
return printer.Printf("time_elapsed.not_yet")
return printer.Print("time_elapsed.not_yet")
}
diff := now.Sub(t)
@ -196,7 +196,7 @@ func elapsedTime(printer *locale.Printer, tz string, t time.Time) string {
d := int(s / 86400)
switch {
case s < 60:
return printer.Printf("time_elapsed.now")
return printer.Print("time_elapsed.now")
case s < 3600:
minutes := int(diff.Minutes())
return printer.Plural("time_elapsed.minutes", minutes, minutes)
@ -204,7 +204,7 @@ func elapsedTime(printer *locale.Printer, tz string, t time.Time) string {
hours := int(diff.Hours())
return printer.Plural("time_elapsed.hours", hours, hours)
case d == 1:
return printer.Printf("time_elapsed.yesterday")
return printer.Print("time_elapsed.yesterday")
case d < 21:
return printer.Plural("time_elapsed.days", d, d)
case d < 31:

8
internal/template/functions_test.go
View file

@ -127,14 +127,14 @@ func TestElapsedTime(t *testing.T) {
in time.Time
out string
}{
{time.Time{}, printer.Printf("time_elapsed.not_yet")},
{time.Now().Add(time.Hour), printer.Printf("time_elapsed.not_yet")},
{time.Now(), printer.Printf("time_elapsed.now")},
{time.Time{}, printer.Print("time_elapsed.not_yet")},
{time.Now().Add(time.Hour), printer.Print("time_elapsed.not_yet")},
{time.Now(), printer.Print("time_elapsed.now")},
{time.Now().Add(-time.Minute), printer.Plural("time_elapsed.minutes", 1, 1)},
{time.Now().Add(-time.Minute * 40), printer.Plural("time_elapsed.minutes", 40, 40)},
{time.Now().Add(-time.Hour), printer.Plural("time_elapsed.hours", 1, 1)},
{time.Now().Add(-time.Hour * 3), printer.Plural("time_elapsed.hours", 3, 3)},
{time.Now().Add(-time.Hour * 32), printer.Printf("time_elapsed.yesterday")},
{time.Now().Add(-time.Hour * 32), printer.Print("time_elapsed.yesterday")},
{time.Now().Add(-time.Hour * 24 * 3), printer.Plural("time_elapsed.days", 3, 3)},
{time.Now().Add(-time.Hour * 24 * 14), printer.Plural("time_elapsed.days", 14, 14)},
{time.Now().Add(-time.Hour * 24 * 15), printer.Plural("time_elapsed.days", 15, 15)},