aboutsummaryrefslogtreecommitdiff
path: root/ui/feed.go
diff options
context:
space:
mode:
authorGravatar Frédéric Guillot <fred@miniflux.net> 2018-04-27 22:07:46 -0700
committerGravatar Frédéric Guillot <fred@miniflux.net> 2018-04-27 22:07:46 -0700
commitddd3af4b85f5a2fe85c17a9cc30cf54743b9eb59 (patch)
tree539b491fc9f67980b09a6ccd282454614a77f8b4 /ui/feed.go
parent6b360d08c1f6c8a6cd1b7608f7af734a3ceef8d7 (diff)
downloadv2-ddd3af4b85f5a2fe85c17a9cc30cf54743b9eb59.tar.gz
v2-ddd3af4b85f5a2fe85c17a9cc30cf54743b9eb59.tar.zst
v2-ddd3af4b85f5a2fe85c17a9cc30cf54743b9eb59.zip
Do not use shared variable to translate templates
Diffstat (limited to 'ui/feed.go')
-rw-r--r--ui/feed.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/feed.go b/ui/feed.go
index e524edf9..ae0a54eb 100644
--- a/ui/feed.go
+++ b/ui/feed.go
@@ -45,7 +45,7 @@ func (c *Controller) ShowFeedsPage(ctx *handler.Context, request *handler.Reques
return
}
- response.HTML().Render("feeds", args.Merge(tplParams{
+ response.HTML().Render("feeds", ctx.UserLanguage(), args.Merge(tplParams{
"feeds": feeds,
"total": len(feeds),
"menu": "feeds",
@@ -88,7 +88,7 @@ func (c *Controller) ShowFeedEntries(ctx *handler.Context, request *handler.Requ
return
}
- response.HTML().Render("feed_entries", args.Merge(tplParams{
+ response.HTML().Render("feed_entries", ctx.UserLanguage(), args.Merge(tplParams{
"feed": feed,
"entries": entries,
"total": count,
@@ -112,7 +112,7 @@ func (c *Controller) EditFeed(ctx *handler.Context, request *handler.Request, re
return
}
- response.HTML().Render("edit_feed", args)
+ response.HTML().Render("edit_feed", ctx.UserLanguage(), args)
}
// UpdateFeed update a subscription and redirect to the feed entries page.
@@ -132,7 +132,7 @@ func (c *Controller) UpdateFeed(ctx *handler.Context, request *handler.Request,
}
if err := feedForm.ValidateModification(); err != nil {
- response.HTML().Render("edit_feed", args.Merge(tplParams{
+ response.HTML().Render("edit_feed", ctx.UserLanguage(), args.Merge(tplParams{
"errorMessage": err.Error(),
}))
return
@@ -141,7 +141,7 @@ func (c *Controller) UpdateFeed(ctx *handler.Context, request *handler.Request,
err = c.store.UpdateFeed(feedForm.Merge(feed))
if err != nil {
logger.Error("[Controller:EditFeed] %v", err)
- response.HTML().Render("edit_feed", args.Merge(tplParams{
+ response.HTML().Render("edit_feed", ctx.UserLanguage(), args.Merge(tplParams{
"errorMessage": "Unable to update this feed.",
}))
return