From b1e8f534eff7569dc2e8dab4dee851d1b709f71b Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sat, 22 Sep 2018 15:04:55 -0700 Subject: Simplify locale package usage (refactoring) --- template/functions.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'template/functions.go') diff --git a/template/functions.go b/template/functions.go index aac6c75..289de3d 100644 --- a/template/functions.go +++ b/template/functions.go @@ -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) } } -- cgit v1.2.3