From 14e25ab9fe09b9951b38e56af2bdff7a0737b280 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sat, 21 Oct 2023 19:50:29 -0700 Subject: Refactor HTTP Client and LocalizedError packages --- internal/ui/user_save.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'internal/ui/user_save.go') diff --git a/internal/ui/user_save.go b/internal/ui/user_save.go index 982c4973..fb5f176e 100644 --- a/internal/ui/user_save.go +++ b/internal/ui/user_save.go @@ -9,6 +9,7 @@ import ( "miniflux.app/v2/internal/http/request" "miniflux.app/v2/internal/http/response/html" "miniflux.app/v2/internal/http/route" + "miniflux.app/v2/internal/locale" "miniflux.app/v2/internal/model" "miniflux.app/v2/internal/ui/form" "miniflux.app/v2/internal/ui/session" @@ -38,14 +39,14 @@ func (h *handler) saveUser(w http.ResponseWriter, r *http.Request) { view.Set("countErrorFeeds", h.store.CountUserFeedsWithErrors(user.ID)) view.Set("form", userForm) - if err := userForm.ValidateCreation(); err != nil { - view.Set("errorMessage", err.Error()) + if validationErr := userForm.ValidateCreation(); validationErr != nil { + view.Set("errorMessage", validationErr.Translate(user.Language)) html.OK(w, r, view.Render("create_user")) return } if h.store.UserExists(userForm.Username) { - view.Set("errorMessage", "error.user_already_exists") + view.Set("errorMessage", locale.NewLocalizedError("error.user_already_exists").Translate(user.Language)) html.OK(w, r, view.Render("create_user")) return } @@ -57,7 +58,7 @@ func (h *handler) saveUser(w http.ResponseWriter, r *http.Request) { } if validationErr := validator.ValidateUserCreationWithPassword(h.store, userCreationRequest); validationErr != nil { - view.Set("errorMessage", validationErr.TranslationKey) + view.Set("errorMessage", validationErr.Translate(user.Language)) html.OK(w, r, view.Render("create_user")) return } -- cgit v1.2.3