diff options
| author |  Frédéric Guillot <fred@miniflux.net>
| 2018-04-27 22:07:46 -0700 |
|---|---|---|
| committer | Frédéric Guillot <fred@miniflux.net>
| 2018-04-27 22:07:46 -0700 |
| commit | ddd3af4b85f5a2fe85c17a9cc30cf54743b9eb59 (patch) | |
| tree | 539b491fc9f67980b09a6ccd282454614a77f8b4 /ui/subscription.go | |
| parent | 6b360d08c1f6c8a6cd1b7608f7af734a3ceef8d7 (diff) | |
| download | v2-ddd3af4b85f5a2fe85c17a9cc30cf54743b9eb59.tar.gz v2-ddd3af4b85f5a2fe85c17a9cc30cf54743b9eb59.tar.zst v2-ddd3af4b85f5a2fe85c17a9cc30cf54743b9eb59.zip | |
Do not use shared variable to translate templates
Diffstat (limited to 'ui/subscription.go')
| -rw-r--r-- | ui/subscription.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ui/subscription.go b/ui/subscription.go index a6cb23cc..e31ab609 100644 --- a/ui/subscription.go +++ b/ui/subscription.go @@ -22,7 +22,7 @@ func (c *Controller) Bookmarklet(ctx *handler.Context, request *handler.Request, } bookmarkletURL := request.QueryStringParam("uri", "") - response.HTML().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", ctx.UserLanguage(), args.Merge(tplParams{ "form": &form.SubscriptionForm{URL: bookmarkletURL}, })) } @@ -37,7 +37,7 @@ func (c *Controller) AddSubscription(ctx *handler.Context, request *handler.Requ return } - response.HTML().Render("add_subscription", args) + response.HTML().Render("add_subscription", ctx.UserLanguage(), args) } // SubmitSubscription try to find a feed from the URL provided by the user. @@ -52,7 +52,7 @@ func (c *Controller) SubmitSubscription(ctx *handler.Context, request *handler.R subscriptionForm := form.NewSubscriptionForm(request.Request()) if err := subscriptionForm.Validate(); err != nil { - response.HTML().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", ctx.UserLanguage(), args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": err.Error(), })) @@ -62,7 +62,7 @@ func (c *Controller) SubmitSubscription(ctx *handler.Context, request *handler.R subscriptions, err := subscription.FindSubscriptions(subscriptionForm.URL) if err != nil { logger.Error("[Controller:SubmitSubscription] %v", err) - response.HTML().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", ctx.UserLanguage(), args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": err, })) @@ -74,14 +74,14 @@ func (c *Controller) SubmitSubscription(ctx *handler.Context, request *handler.R n := len(subscriptions) switch { case n == 0: - response.HTML().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", ctx.UserLanguage(), args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": "Unable to find any subscription.", })) case n == 1: feed, err := c.feedHandler.CreateFeed(user.ID, subscriptionForm.CategoryID, subscriptions[0].URL, subscriptionForm.Crawler) if err != nil { - response.HTML().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", ctx.UserLanguage(), args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": err, })) @@ -90,7 +90,7 @@ func (c *Controller) SubmitSubscription(ctx *handler.Context, request *handler.R response.Redirect(ctx.Route("feedEntries", "feedID", feed.ID)) case n > 1: - response.HTML().Render("choose_subscription", args.Merge(tplParams{ + response.HTML().Render("choose_subscription", ctx.UserLanguage(), args.Merge(tplParams{ "categoryID": subscriptionForm.CategoryID, "subscriptions": subscriptions, })) @@ -109,7 +109,7 @@ func (c *Controller) ChooseSubscription(ctx *handler.Context, request *handler.R subscriptionForm := form.NewSubscriptionForm(request.Request()) if err := subscriptionForm.Validate(); err != nil { - response.HTML().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", ctx.UserLanguage(), args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": err.Error(), })) @@ -118,7 +118,7 @@ func (c *Controller) ChooseSubscription(ctx *handler.Context, request *handler.R feed, err := c.feedHandler.CreateFeed(user.ID, subscriptionForm.CategoryID, subscriptionForm.URL, subscriptionForm.Crawler) if err != nil { - response.HTML().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", ctx.UserLanguage(), args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": err, })) |