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) --- ui/integration_update.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ui/integration_update.go') diff --git a/ui/integration_update.go b/ui/integration_update.go index 2d10413..f470e4b 100644 --- a/ui/integration_update.go +++ b/ui/integration_update.go @@ -13,12 +13,14 @@ import ( "miniflux.app/http/request" "miniflux.app/http/response/html" "miniflux.app/http/route" + "miniflux.app/locale" "miniflux.app/ui/form" "miniflux.app/ui/session" ) // UpdateIntegration updates integration settings. func (c *Controller) UpdateIntegration(w http.ResponseWriter, r *http.Request) { + printer := locale.NewPrinter(request.UserLanguage(r)) sess := session.New(c.store, request.SessionID(r)) user, err := c.store.UserByID(request.UserID(r)) if err != nil { @@ -36,7 +38,7 @@ func (c *Controller) UpdateIntegration(w http.ResponseWriter, r *http.Request) { integrationForm.Merge(integration) if integration.FeverUsername != "" && c.store.HasDuplicateFeverUsername(user.ID, integration.FeverUsername) { - sess.NewFlashErrorMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("error.duplicate_fever_username")) + sess.NewFlashErrorMessage(printer.Printf("error.duplicate_fever_username")) response.Redirect(w, r, route.Path(c.router, "integrations")) return } @@ -53,6 +55,6 @@ func (c *Controller) UpdateIntegration(w http.ResponseWriter, r *http.Request) { return } - sess.NewFlashMessage(c.translator.GetLanguage(request.UserLanguage(r)).Get("alert.prefs_saved")) + sess.NewFlashMessage(printer.Printf("alert.prefs_saved")) response.Redirect(w, r, route.Path(c.router, "integrations")) } -- cgit v1.2.3