diff --git a/conf/lang/en-us.ini b/conf/lang/en-us.ini index 7cb0bda9..b1bb085a 100644 --- a/conf/lang/en-us.ini +++ b/conf/lang/en-us.ini @@ -363,6 +363,18 @@ creator = Creator create_time = Create time no_project_space = No Project Space +[search] +title = Search +search_title = Show search result for %s +doc = document +prj = project +blog = blog +from_proj = from project +from_blog = from blog +author = author +update_time = update time +no_result = No search result + [page] first = first last = last diff --git a/conf/lang/zh-cn.ini b/conf/lang/zh-cn.ini index 17a20698..feda1a10 100644 --- a/conf/lang/zh-cn.ini +++ b/conf/lang/zh-cn.ini @@ -356,13 +356,25 @@ ft_update_time = 更新时间: prj_space_list = 项目空间列表 prj_space_list_of = 项目空间%s的项目列表 search_title = 显示项目空间为"%s"的项目 -authro = 作者 +author = 作者 no_project = 暂无项目 prj_amount = 项目数量 creator = 创建人 create_time = 创建时间 no_project_space = 没有项目空间 +[search] +title = 搜索 +search_title = 显示"%s"的搜索结果 +doc = 文档 +prj = 项目 +blog = 文章 +from_proj = 来自项目 +from_blog = 来自文章 +author = 作者 +update_time = 更新时间 +no_result = 暂无相关搜索结果 + [page] first = 首页 last = 末页 diff --git a/controllers/SearchController.go b/controllers/SearchController.go index 069c483b..afb561ba 100644 --- a/controllers/SearchController.go +++ b/controllers/SearchController.go @@ -1,10 +1,12 @@ package controllers import ( - "github.com/astaxie/beego/logs" "strconv" "strings" + "github.com/astaxie/beego/logs" + "github.com/beego/i18n" + "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/models" "github.com/mindoc-org/mindoc/utils" @@ -87,16 +89,16 @@ func (c *SearchController) User() { key := c.Ctx.Input.Param(":key") keyword := strings.TrimSpace(c.GetString("q")) if key == "" || keyword == "" { - c.JsonResult(404, "参数错误") + c.JsonResult(404, i18n.Tr(c.Lang, "message.param_error")) } keyword = sqltil.EscapeLike(keyword) book, err := models.NewBookResult().FindByIdentify(key, c.Member.MemberId) if err != nil { if err == models.ErrPermissionDenied { - c.JsonResult(403, "没有权限") + c.JsonResult(403, i18n.Tr(c.Lang, "message.no_permission")) } - c.JsonResult(500, "项目不存在") + c.JsonResult(500, i18n.Tr(c.Lang, "message.item_not_exist")) } //members, err := models.NewMemberRelationshipResult().FindNotJoinUsersByAccount(book.BookId, 10, "%"+keyword+"%") diff --git a/views/items/list.tpl b/views/items/list.tpl index 2d293ad7..d187d1e9 100644 --- a/views/items/list.tpl +++ b/views/items/list.tpl @@ -36,7 +36,7 @@
- {{i18n .Lang "project.author"}} + {{i18n $.Lang "project.author"}} - {{if eq $item.RealName "" }}{{$item.CreateName}}{{else}}{{$item.RealName}}{{end}} diff --git a/views/search/index.tpl b/views/search/index.tpl index 1cf8d408..5a55275e 100644 --- a/views/search/index.tpl +++ b/views/search/index.tpl @@ -5,7 +5,7 @@ - 搜索 - Powered by MinDoc + {{i18n .Lang "search.title"}} - Powered by MinDoc @@ -19,7 +19,7 @@ {{template "widgets/header.tpl" .}}
- 显示"{{.Keyword}}"的搜索结果 + {{i18n .Lang "search.search_title" .Keyword}}
@@ -27,13 +27,13 @@
{{if eq $item.SearchType "document"}} - 文档 + {{i18n $.Lang "search.doc"}} {{str2html $item.DocumentName}} {{else if eq $item.SearchType "book"}} - 项目 + {{i18n $.Lang "search.prj"}} {{str2html $item.DocumentName}} {{else}} - 文章 + {{i18n $.Lang "search.blog"}} {{str2html $item.DocumentName}} {{end}}
@@ -42,20 +42,20 @@
{{if eq $item.SearchType "document"}} - 来自项目:{{$item.BookName}} + {{i18n $.Lang "search.from_proj"}}:{{$item.BookName}} {{else if eq $item.SearchType "book"}} - 项目:{{$item.BookName}} + {{i18n $.Lang "search.prj"}}:{{$item.BookName}} {{else}} - 来自文章:{{$item.BookName}} + {{i18n $.Lang "search.from_blog"}}:{{$item.BookName}} {{end}} - 作者:{{$item.Author}} - 更新时间:{{date_format $item.ModifyTime "2006-01-02 15:04:05"}} + {{i18n $.Lang "search.author"}}:{{$item.Author}} + {{i18n $.Lang "search.update_time"}}:{{date_format $item.ModifyTime "2006-01-02 15:04:05"}}
{{else}}
- 暂无相关搜索结果 + {{i18n .Lang "search.no_result"}}
{{end}}