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_test.go | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'template/functions_test.go') diff --git a/template/functions_test.go b/template/functions_test.go index 04982c7..10d5535 100644 --- a/template/functions_test.go +++ b/template/functions_test.go @@ -97,28 +97,26 @@ func TestIsEmail(t *testing.T) { } func TestElapsedTime(t *testing.T) { - translator := locale.Load() - language := translator.GetLanguage("fr_FR") - + printer := locale.NewPrinter("en_US") var dt = []struct { in time.Time out string }{ - {time.Time{}, language.Get("time_elapsed.not_yet")}, - {time.Now().Add(time.Hour), language.Get("time_elapsed.not_yet")}, - {time.Now(), language.Get("time_elapsed.now")}, - {time.Now().Add(-time.Minute), language.Plural("time_elapsed.minutes", 1, 1)}, - {time.Now().Add(-time.Minute * 40), language.Plural("time_elapsed.minutes", 40, 40)}, - {time.Now().Add(-time.Hour), language.Plural("time_elapsed.hours", 1, 1)}, - {time.Now().Add(-time.Hour * 3), language.Plural("time_elapsed.hours", 3, 3)}, - {time.Now().Add(-time.Hour * 32), language.Get("time_elapsed.yesterday")}, - {time.Now().Add(-time.Hour * 24 * 3), language.Plural("time_elapsed.days", 3, 3)}, - {time.Now().Add(-time.Hour * 24 * 14), language.Plural("time_elapsed.weeks", 2, 2)}, - {time.Now().Add(-time.Hour * 24 * 60), language.Plural("time_elapsed.months", 2, 2)}, - {time.Now().Add(-time.Hour * 24 * 365 * 3), language.Plural("time_elapsed.years", 3, 3)}, + {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.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 * 24 * 3), printer.Plural("time_elapsed.days", 3, 3)}, + {time.Now().Add(-time.Hour * 24 * 14), printer.Plural("time_elapsed.weeks", 2, 2)}, + {time.Now().Add(-time.Hour * 24 * 60), printer.Plural("time_elapsed.months", 2, 2)}, + {time.Now().Add(-time.Hour * 24 * 365 * 3), printer.Plural("time_elapsed.years", 3, 3)}, } for i, tt := range dt { - if out := elapsedTime(language, "Local", tt.in); out != tt.out { + if out := elapsedTime(printer, "Local", tt.in); out != tt.out { t.Errorf(`%d. content mismatch for "%v": expected=%q got=%q`, i, tt.in, tt.out, out) } } -- cgit v1.2.3