Simplify locale package usage (refactoring)

3 files changed, 38 insertions, 42 deletions

diff --git a/template/engine.go b/template/engine.go
index bd99742..e4cdc96 100644
--- a/template/engine.go
+++ b/template/engine.go
@@ -19,9 +19,8 @@ import (
 
 // Engine handles the templating system.
 type Engine struct {
-	templates  map[string]*template.Template
-	translator *locale.Translator
-	funcMap    *funcMap
+	templates map[string]*template.Template
+	funcMap   *funcMap
 }
 
 func (e *Engine) parseAll() {
@@ -43,29 +42,29 @@ func (e *Engine) Render(name, language string, data interface{}) []byte {
 		logger.Fatal("[Template] The template %s does not exists", name)
 	}
 
-	lang := e.translator.GetLanguage(language)
+	printer := locale.NewPrinter(language)
 
 	// Functions that need to be declared at runtime.
 	tpl.Funcs(template.FuncMap{
 		"elapsed": func(timezone string, t time.Time) string {
-			return elapsedTime(lang, timezone, t)
+			return elapsedTime(printer, timezone, t)
 		},
 		"t": func(key interface{}, args ...interface{}) string {
-			switch key.(type) {
+			switch k := key.(type) {
 			case string:
-				return lang.Get(key.(string), args...)
+				return printer.Printf(k, args...)
 			case errors.LocalizedError:
-				return key.(errors.LocalizedError).Localize(lang)
+				return k.Localize(printer)
 			case *errors.LocalizedError:
-				return key.(*errors.LocalizedError).Localize(lang)
+				return k.Localize(printer)
 			case error:
-				return key.(error).Error()
+				return k.Error()
 			default:
 				return ""
 			}
 		},
 		"plural": func(key string, n int, args ...interface{}) string {
-			return lang.Plural(key, n, args...)
+			return printer.Plural(key, n, args...)
 		},
 	})
 
@@ -79,11 +78,10 @@ func (e *Engine) Render(name, language string, data interface{}) []byte {
 }
 
 // NewEngine returns a new template engine.
-func NewEngine(cfg *config.Config, router *mux.Router, translator *locale.Translator) *Engine {
+func NewEngine(cfg *config.Config, router *mux.Router) *Engine {
 	tpl := &Engine{
-		templates:  make(map[string]*template.Template),
-		translator: translator,
-		funcMap:    newFuncMap(cfg, router),
+		templates: make(map[string]*template.Template),
+		funcMap:   newFuncMap(cfg, router),
 	}
 
 	tpl.parseAll()
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)
 	}
 }
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)
 		}
 	}