lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-09-18 09:44:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug for i18n and beego v2

Browse Source
This commit is contained in:
shiqstone
2021-04-21 20:44:19 +08:00
parent 4ad0fe74d0
commit 0fb6fcb114
9 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
controllers/BaseController.go
View File

@@ -7,15 +7,13 @@ import (
"strings"
"time"
"github.com/astaxie/beego/logs"
"github.com/beego/i18n"
"html/template"
"io/ioutil"
"path/filepath"
"github.com/beego/beego/v2/core/logs"
"github.com/beego/beego/v2/server/web"
"github.com/beego/i18n"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/models"
"github.com/mindoc-org/mindoc/utils"
@@ -211,14 +209,14 @@ func (c *BaseController) CheckErrorResult(code int, err error) {
func (c *BaseController) SetLang() {
hasCookie := false
lang := c.Input().Get("lang")
lang := c.GetString("lang")
if len(lang) == 0 {
lang = c.Ctx.GetCookie("lang")
hasCookie = true
}
if len(lang) == 0 ||
!i18n.IsExist(lang) {
lang = beego.AppConfig.String("default_lang")
lang, _ = web.AppConfig.String("default_lang")
}
if !hasCookie {
c.Ctx.SetCookie("lang", lang, 1<<31-1, "/")