Compare commits

..

3 Commits

Author SHA1 Message Date
naiba
1acb4d0330 feat: upgrade frontend
Some checks failed
Contributors / contributors (push) Waiting to run
Sync / sync-to-jihulab (push) Waiting to run
Run Tests / tests (macos) (push) Has been cancelled
Run Tests / tests (ubuntu) (push) Has been cancelled
Run Tests / tests (windows) (push) Has been cancelled
CodeQL / Analyze (go) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
2024-12-16 00:05:55 +08:00
naiba
eab319e9c1 feat: upgrade frontend 2024-12-15 20:29:51 +08:00
naiba
180773a4f3 feat: update language handling and frontend template versions 2024-12-15 17:07:53 +08:00
3 changed files with 9 additions and 5 deletions

View File

@ -2,6 +2,7 @@ package controller
import ( import (
"errors" "errors"
"strings"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
@ -39,6 +40,8 @@ func listConfig(c *gin.Context) (model.SettingResponse, error) {
} }
} }
conf.Config.Language = strings.Replace(conf.Config.Language, "_", "-", -1)
return conf, nil return conf, nil
} }
@ -70,7 +73,9 @@ func updateConfig(c *gin.Context) (any, error) {
if !userTemplateValid { if !userTemplateValid {
return nil, errors.New("invalid user template") return nil, errors.New("invalid user template")
} }
singleton.Conf.Language = sf.Language
singleton.Conf.Language = strings.Replace(sf.Language, "-", "_", -1)
singleton.Conf.EnableIPChangeNotification = sf.EnableIPChangeNotification singleton.Conf.EnableIPChangeNotification = sf.EnableIPChangeNotification
singleton.Conf.EnablePlainIPInNotification = sf.EnablePlainIPInNotification singleton.Conf.EnablePlainIPInNotification = sf.EnablePlainIPInNotification
singleton.Conf.Cover = sf.Cover singleton.Conf.Cover = sf.Cover

View File

@ -79,12 +79,11 @@ func (c *Config) Read(path string, frontendTemplates []FrontendTemplate) error {
if err != nil { if err != nil {
return err return err
} }
if c.ListenPort == 0 { if c.ListenPort == 0 {
c.ListenPort = 8008 c.ListenPort = 8008
} }
if c.Language == "" { if c.Language == "" {
c.Language = "zh_CN" c.Language = "en_US"
} }
if c.Location == "" { if c.Location == "" {
c.Location = "Asia/Shanghai" c.Location = "Asia/Shanghai"

View File

@ -2,14 +2,14 @@
name: "OfficialAdmin" name: "OfficialAdmin"
repository: "https://github.com/nezhahq/admin-frontend" repository: "https://github.com/nezhahq/admin-frontend"
author: "nezhahq" author: "nezhahq"
version: "v1.1.7" version: "v1.2.0"
isadmin: true isadmin: true
isofficial: true isofficial: true
- path: "user-dist" - path: "user-dist"
name: "Official" name: "Official"
repository: "https://github.com/hamster1963/nezha-dash-v1" repository: "https://github.com/hamster1963/nezha-dash-v1"
author: "hamster1963" author: "hamster1963"
version: "v1.2.8" version: "v1.3.5"
isofficial: true isofficial: true
- path: "nazhua-dist" - path: "nazhua-dist"
name: "Nazhua" name: "Nazhua"