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

Store language in session to show the login page translated

Browse source
This commit is contained in:
Frédéric Guillot 2018-01-18 21:53:31 -08:00
parent 6302c3b219
commit bdcc4134fa
7 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
http/handler/context.go
View file

@ -80,8 +80,12 @@ func (c *Context) LoggedUser() *model.User {
// UserLanguage get the locale used by the current logged user.
func (c *Context) UserLanguage() string {
user := c.LoggedUser()
return user.Language
if c.IsAuthenticated() {
user := c.LoggedUser()
return user.Language
}
return c.getContextStringValue(middleware.UserLanguageContextKey)
}
// Translate translates a message in the current language.
@ -145,7 +149,6 @@ func (c *Context) getContextStringValue(key *middleware.ContextKey) string {
return v.(string)
}
logger.Error("[Core:Context] Missing key: %s", key)
return ""
}

5
http/handler/handler.go
View file

@ -46,9 +46,10 @@ func (h *Handler) Use(f ControllerFunc) http.Handler {
ctx := NewContext(r, h.store, h.router, h.translator)
request := NewRequest(r)
response := NewResponse(w, r, h.template)
language := ctx.UserLanguage()
if ctx.IsAuthenticated() {
h.template.SetLanguage(ctx.UserLanguage())
if language != "" {
h.template.SetLanguage(language)
} else {
h.template.SetLanguage("en_US")
}