Merge remote-tracking branch 'upstream/master'

commands/command.go

@@ -8,6 +8,7 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
 
@@ -22,6 +23,7 @@ import (
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/beego/beego/v2/server/web"
+	"github.com/beego/i18n"
 	"github.com/howeyc/fsnotify"
 	"github.com/lifei6671/gocaptcha"
 	"github.com/mindoc-org/mindoc/cache"
@@ -262,6 +264,12 @@ func RegisterFunction() {
 		logs.Error("注册函数 urlfor 出错 ->", err)
 		os.Exit(-1)
 	}
+	//读取配置值(未作任何转换)
+	err = web.AddFuncMap("conf", conf.CONF)
+	if err != nil {
+		logs.Error("注册函数 conf 出错 ->", err)
+		os.Exit(-1)
+	}
 	err = web.AddFuncMap("date_format", func(t time.Time, format string) string {
 		return t.Local().Format(format)
 	})
@@ -269,6 +277,19 @@ func RegisterFunction() {
 		logs.Error("注册函数 date_format 出错 ->", err)
 		os.Exit(-1)
 	}
+
+	err = web.AddFuncMap("i18n", i18n.Tr)
+	if err != nil {
+		logs.Error("注册函数 i18n 出错 ->", err)
+		os.Exit(-1)
+	}
+	langs := strings.Split("en-us|zh-cn", "|")
+	for _, lang := range langs {
+		if err := i18n.SetMessage(lang, "conf/lang/"+lang+".ini"); err != nil {
+			logs.Error("Fail to set message file: " + err.Error())
+			return
+		}
+	}
 }
 
 //解析命令
@@ -385,15 +406,15 @@ func RegisterCache() {
 		var redisConfig struct {
 			Conn     string `json:"conn"`
 			Password string `json:"password"`
-			DbNum    int    `json:"dbNum"`
+			DbNum    string `json:"dbNum"`
 		}
-		redisConfig.DbNum = 0
+		redisConfig.DbNum = "0"
 		redisConfig.Conn = web.AppConfig.DefaultString("cache_redis_host", "")
 		if pwd := web.AppConfig.DefaultString("cache_redis_password", ""); pwd != "" {
 			redisConfig.Password = pwd
 		}
 		if dbNum := web.AppConfig.DefaultInt("cache_redis_db", 0); dbNum > 0 {
-			redisConfig.DbNum = dbNum
+			redisConfig.DbNum = strconv.Itoa(dbNum)
 		}
 
 		bc, err := json.Marshal(&redisConfig)

commands/install.go

@@ -10,6 +10,8 @@ import (
 
 	"github.com/beego/beego/v2/client/orm"
 	"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"
@@ -96,11 +98,16 @@ func ModifyPassword() {
 func initialization() {
 
 	err := models.NewOption().Init()
-
 	if err != nil {
 		panic(err.Error())
 	}
 
+	lang, _ := web.AppConfig.String("default_lang")
+	err = i18n.SetMessage(lang, "conf/lang/"+lang+".ini")
+	if err != nil {
+		panic(fmt.Errorf("initialize locale error: %s", err))
+	}
+
 	member, err := models.NewMember().FindByFieldFirst("account", "admin")
 	if errors.Is(err, orm.ErrNoRows) {
 
@@ -122,10 +129,10 @@ func initialization() {
 		book := models.NewBook()
 
 		book.MemberId = member.MemberId
-		book.BookName = "MinDoc演示项目"
+		book.BookName = i18n.Tr(lang, "init.default_proj_name") //"MinDoc演示项目"
 		book.Status = 0
 		book.ItemId = 1
-		book.Description = "这是一个MinDoc演示项目，该项目是由系统初始化时自动创建。"
+		book.Description = i18n.Tr(lang, "init.default_proj_desc") //"这是一个MinDoc演示项目，该项目是由系统初始化时自动创建。"
 		book.CommentCount = 0
 		book.PrivatelyOwned = 0
 		book.CommentStatus = "closed"
@@ -137,7 +144,7 @@ func initialization() {
 		book.Editor = "markdown"
 		book.Theme = "default"
 
-		if err := book.Insert(); err != nil {
+		if err := book.Insert(lang); err != nil {
 			panic("初始化项目失败 -> " + err.Error())
 		}
 	} else if err != nil {
@@ -146,7 +153,7 @@ func initialization() {
 
 	if !models.NewItemsets().Exist(1) {
 		item := models.NewItemsets()
-		item.ItemName = "默认项目空间"
+		item.ItemName = i18n.Tr(lang, "init.default_proj_space") //"默认项目空间"
 		item.MemberId = 1
 		if err := item.Save(); err != nil {
 			panic("初始化项目空间失败 -> " + err.Error())

commands/update.go

@@ -14,7 +14,9 @@ import (
 //检查最新版本.
 func CheckUpdate() {
 
-	resp, err := http.Get("https://api.github.com/repos/lifei6671/mindoc/tags")
+	fmt.Println("MinDoc current version => ", conf.VERSION)
+
+	resp, err := http.Get("https://api.github.com/repos/mindoc-org/mindoc/tags")
 
 	if err != nil {
 		logs.Error("CheckUpdate => ", err)
@@ -33,7 +35,6 @@ func CheckUpdate() {
 	}
 
 	err = json.Unmarshal(body, &result)
-	fmt.Println("MinDoc current version => ", conf.VERSION)
 	if err != nil {
 		logs.Error("CheckUpdate => ", err)
 		os.Exit(0)