oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-01 17:38:37 +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

9
ui/opml.go
View file

@ -7,12 +7,13 @@ package ui
import (
"github.com/miniflux/miniflux/http/handler"
"github.com/miniflux/miniflux/logger"
"github.com/miniflux/miniflux/reader/opml"
)
// Export generates the OPML file.
func (c *Controller) Export(ctx *handler.Context, request *handler.Request, response *handler.Response) {
user := ctx.LoggedUser()
opml, err := c.opmlHandler.Export(user.ID)
opml, err := opml.NewHandler(c.store).Export(user.ID)
if err != nil {
response.HTML().ServerError(err)
return
@ -29,7 +30,7 @@ func (c *Controller) Import(ctx *handler.Context, request *handler.Request, resp
return
}
response.HTML().Render("import", args.Merge(tplParams{
response.HTML().Render("import", ctx.UserLanguage(), args.Merge(tplParams{
"menu": "feeds",
}))
}
@ -52,14 +53,14 @@ func (c *Controller) UploadOPML(ctx *handler.Context, request *handler.Request,
fileHeader.Size,
)
if impErr := c.opmlHandler.Import(user.ID, file); impErr != nil {
if impErr := opml.NewHandler(c.store).Import(user.ID, file); impErr != nil {
args, err := c.getCommonTemplateArgs(ctx)
if err != nil {
response.HTML().ServerError(err)
return
}
response.HTML().Render("import", args.Merge(tplParams{
response.HTML().Render("import", ctx.UserLanguage(), args.Merge(tplParams{
"errorMessage": impErr,
"menu": "feeds",
}))