Lang (#989)

* [lang] fix tiny language * [lang] fix lang * [lang] update document lang --------- Co-authored-by: admin <[email protected]>
mindoc-org · Dec 27, 2024 · 7f25bc7 · 7f25bc7
1 parent 0000931
commit 7f25bc7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/conf/lang/en-us.ini b/conf/lang/en-us.ini
@@ -272,7 +272,7 @@ team_name = Team name
 member_amount = Number of members
 join_time = Join Time
 project_setting = Project setting
-handover_project = Hanover
+handover_project = Handover
 make_public = Into Public
 make_private = Into Privete
 history_record_amount = Number of history records
@@ -443,6 +443,8 @@ ft_create_time = Create time：
 ft_update_time = Update time：
 view_count = Number of views
 changetheme = Switch themes
+prev = prev
+next = next
 
 [project]
 prj_space_list = Project Space List

diff --git a/conf/lang/zh-cn.ini b/conf/lang/zh-cn.ini
@@ -443,6 +443,8 @@ ft_create_time = 创建时间：
 ft_update_time = 更新时间：
 view_count = 阅读次数
 changetheme = 切换主题
+prev = 上一篇
+next = 下一篇
 
 [project]
 prj_space_list = 项目空间列表

diff --git a/controllers/DocumentController.go b/controllers/DocumentController.go
@@ -214,17 +214,17 @@ func (c *DocumentController) Read() {
 	}
 	var PrevName, PrevPath, NextName, NextPath string
 	if index == 0 {
-		c.Data["PrevName"] = "没有了"
-		PrevName = "没有了"
+		c.Data["PrevName"] = ""
+		PrevName = ""
 	} else {
 		c.Data["PrevPath"] = identify + "/" + flat[index-1].Identify
 		c.Data["PrevName"] = flat[index-1].DocumentName
 		PrevPath = identify + "/" + flat[index-1].Identify
 		PrevName = flat[index-1].DocumentName
 	}
 	if index == len(flat)-1 {
-		c.Data["NextName"] = "没有了"
-		NextName = "没有了"
+		c.Data["NextName"] = ""
+		NextName = ""
 	} else {
 		c.Data["NextPath"] = identify + "/" + flat[index+1].Identify
 		c.Data["NextName"] = flat[index+1].DocumentName
@@ -251,7 +251,7 @@ func (c *DocumentController) Read() {
 		data.DocId = doc.DocumentId
 		data.DocIdentify = doc.Identify
 		data.DocTitle = doc.DocumentName
-		data.Body = doc.Release + "<div class='wiki-bottom-left'>上一篇： <a href='/docs/" + PrevPath + "' rel='prev'>" + PrevName + "</a><br />下一篇： <a href='/docs/" + NextPath + "' rel='next'>" + NextName + "</a><br /></div>"
+		data.Body = doc.Release + "<div class='wiki-bottom-left'>"+ i18n.Tr(c.Lang, "doc.prev") + "： <a href='/docs/" + PrevPath + "' rel='prev'>" + PrevName + "</a><br />" + i18n.Tr(c.Lang, "doc.next") + "： <a href='/docs/" + NextPath + "' rel='next'>" + NextName + "</a><br /></div>"
 		data.Title = doc.DocumentName + " - Powered by MinDoc"
 		data.Version = doc.Version
 		data.ViewCount = doc.ViewCount
@@ -283,7 +283,7 @@ func (c *DocumentController) Read() {
 	c.Data["Model"] = bookResult
 	c.Data["Result"] = template.HTML(tree)
 	c.Data["Title"] = doc.DocumentName
-	c.Data["Content"] = template.HTML(doc.Release + "<div class='wiki-bottom-left'>上一篇： <a href='/docs/" + PrevPath + "' rel='prev'>" + PrevName + "</a><br />下一篇： <a href='/docs/" + NextPath + "' rel='next'>" + NextName + "</a><br /></div>")
+	c.Data["Content"] = template.HTML(doc.Release + "<div class='wiki-bottom-left'>"+ i18n.Tr(c.Lang, "doc.prev") + "： <a href='/docs/" + PrevPath + "' rel='prev'>" + PrevName + "</a><br />" + i18n.Tr(c.Lang, "doc.next") + "： <a href='/docs/" + NextPath + "' rel='next'>" + NextName + "</a><br /></div>")
 	c.Data["ViewCount"] = doc.ViewCount
 	c.Data["FoldSetting"] = "closed"
 	if bookResult.Editor == EditorCherryMarkdown {

diff --git a/controllers/ManagerController.go b/controllers/ManagerController.go
@@ -1017,15 +1017,14 @@ func (c *ManagerController) TeamChangeMemberRole() {
 	if memberId <= 0 || roleId <= 0 || teamId <= 0 || roleId > int(conf.BookObserver) {
 		c.JsonResult(5001, i18n.Tr(c.Lang, "message.param_error"))
 	}
-
 	teamMember, err := models.NewTeamMember().ChangeRoleId(teamId, memberId, conf.BookRole(roleId))
 
 	if err != nil {
 		c.JsonResult(5002, err.Error())
 	} else {
+		teamMember.SetLang(c.Lang).Include()
 		c.JsonResult(0, "OK", teamMember)
 	}
-
 }
 
 // 团队项目列表.