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

Simplify locale package usage (refactoring)

Browse source
This commit is contained in:
Frédéric Guillot 2018-09-22 15:04:55 -07:00
parent aae9b4eb83
commit b1e8f534ef
26 changed files with 443 additions and 299 deletions
Download patch file Download diff file Expand all files Collapse all files

22
template/functions.go
View file

@ -135,15 +135,15 @@ func isEmail(str string) bool {
return true
}
func elapsedTime(language *locale.Language, tz string, t time.Time) string {
func elapsedTime(printer *locale.Printer, tz string, t time.Time) string {
if t.IsZero() {
return language.Get("time_elapsed.not_yet")
return printer.Printf("time_elapsed.not_yet")
}
now := timezone.Now(tz)
t = timezone.Convert(tz, t)
if now.Before(t) {
return language.Get("time_elapsed.not_yet")
return printer.Printf("time_elapsed.not_yet")
}
diff := now.Sub(t)
@ -153,25 +153,25 @@ func elapsedTime(language *locale.Language, tz string, t time.Time) string {
d := int(s / 86400)
switch {
case s < 60:
return language.Get("time_elapsed.now")
return printer.Printf("time_elapsed.now")
case s < 3600:
minutes := int(diff.Minutes())
return language.Plural("time_elapsed.minutes", minutes, minutes)
return printer.Plural("time_elapsed.minutes", minutes, minutes)
case s < 86400:
hours := int(diff.Hours())
return language.Plural("time_elapsed.hours", hours, hours)
return printer.Plural("time_elapsed.hours", hours, hours)
case d == 1:
return language.Get("time_elapsed.yesterday")
return printer.Printf("time_elapsed.yesterday")
case d < 7:
return language.Plural("time_elapsed.days", d, d)
return printer.Plural("time_elapsed.days", d, d)
case d < 31:
weeks := int(math.Ceil(float64(d) / 7))
return language.Plural("time_elapsed.weeks", weeks, weeks)
return printer.Plural("time_elapsed.weeks", weeks, weeks)
case d < 365:
months := int(math.Ceil(float64(d) / 30))
return language.Plural("time_elapsed.months", months, months)
return printer.Plural("time_elapsed.months", months, months)
default:
years := int(math.Ceil(float64(d) / 365))
return language.Plural("time_elapsed.years", years, years)
return printer.Plural("time_elapsed.years", years, years)
}
}