oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-07-27 17:28:38 +00:00
Code Wiki Activity

Do not use shared variable to translate templates

Browse source
This commit is contained in:
Frédéric Guillot 2018-04-27 22:07:46 -07:00
parent 6b360d08c1
commit ddd3af4b85
21 changed files with 104 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ui/settings.go
View file

@ -22,7 +22,7 @@ func (c *Controller) ShowSettings(ctx *handler.Context, request *handler.Request
return
}
response.HTML().Render("settings", args)
response.HTML().Render("settings", ctx.UserLanguage(), args)
}
// UpdateSettings update the settings.
@ -37,7 +37,7 @@ func (c *Controller) UpdateSettings(ctx *handler.Context, request *handler.Reque
}
if err := settingsForm.Validate(); err != nil {
response.HTML().Render("settings", args.Merge(tplParams{
response.HTML().Render("settings", ctx.UserLanguage(), args.Merge(tplParams{
"form": settingsForm,
"errorMessage": err.Error(),
}))
@ -45,7 +45,7 @@ func (c *Controller) UpdateSettings(ctx *handler.Context, request *handler.Reque
}
if c.store.AnotherUserExists(user.ID, settingsForm.Username) {
response.HTML().Render("settings", args.Merge(tplParams{
response.HTML().Render("settings", ctx.UserLanguage(), args.Merge(tplParams{
"form": settingsForm,
"errorMessage": "This user already exists.",
}))
@ -55,7 +55,7 @@ func (c *Controller) UpdateSettings(ctx *handler.Context, request *handler.Reque
err = c.store.UpdateUser(settingsForm.Merge(user))
if err != nil {
logger.Error("[Controller:UpdateSettings] %v", err)
response.HTML().Render("settings", args.Merge(tplParams{
response.HTML().Render("settings", ctx.UserLanguage(), args.Merge(tplParams{
"form": settingsForm,
"errorMessage": "Unable to update this user.",
}))