pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix switch language (#14484)

Browse source 
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
Lunny Xiao 2021-01-27 22:20:42 +08:00 committed by GitHub
parent af7f71207c
commit 669ff8e9b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/middlewares/locale.go
View file

@ -15,24 +15,22 @@ import (
// Locale handle locale // Locale handle locale
func Locale(resp http.ResponseWriter, req *http.Request) translation.Locale { func Locale(resp http.ResponseWriter, req *http.Request) translation.Locale {
hasCookie := false
// 1. Check URL arguments. // 1. Check URL arguments.
lang := req.URL.Query().Get("lang") lang := req.URL.Query().Get("lang")
var changeLang = lang != ""
// 2. Get language information from cookies. // 2. Get language information from cookies.
if len(lang) == 0 { if len(lang) == 0 {
ck, _ := req.Cookie("lang") ck, _ := req.Cookie("lang")
if ck != nil { if ck != nil {
lang = ck.Value lang = ck.Value
hasCookie = true
} }
} }
// Check again in case someone modify by purpose. // Check again in case someone modify by purpose.
if lang != "" && !i18n.IsExist(lang) { if lang != "" && !i18n.IsExist(lang) {
lang = "" lang = ""
hasCookie = false changeLang = false
} }
// 3. Get language information from 'Accept-Language'. // 3. Get language information from 'Accept-Language'.
@ -43,8 +41,8 @@ func Locale(resp http.ResponseWriter, req *http.Request) translation.Locale {
lang = tag.String() lang = tag.String()
} }
if !hasCookie { if changeLang {
req.AddCookie(NewCookie("lang", lang, 1<<31-1)) SetCookie(resp, "lang", lang, 1<<31-1)
} }
return translation.NewLocale(lang) return translation.NewLocale(lang)