diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 66af19931..39a892cc7 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -902,6 +902,7 @@ unzip_successed=Unzip Successed unzip_failed=Unzip Failed unzip_stared=Unzipping unzip_status=Unzip Status +collection_num=Collection Nums [repo] owner = Owner repo_name = Repository Name diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index d74e08899..b9acb6ec0 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -907,7 +907,7 @@ unzip_successed=解压成功 unzip_failed=解压失败 unzip_stared=解压中 unzip_status=解压状态 - +collection_num=收藏数量 [repo] owner=拥有者 repo_name=项目名称 @@ -1474,7 +1474,7 @@ issues.filter_sort.mostforks=派生由多到少 issues.filter_sort.fewestforks=派生由少到多 issues.filter_sort.downloadtimes=下载次数 issues.filter_sort.citations=引用次数 -issues.filter_sort.moststars=收藏数量 +issues.filter_sort.moststars=点赞由多到少 issues.filter_sort.mostusecount=最多引用 issues.filter_sort.fewestusecount=最少引用 diff --git a/templates/explore/datasets.tmpl b/templates/explore/datasets.tmpl index 327c4fb98..17164cfed 100644 --- a/templates/explore/datasets.tmpl +++ b/templates/explore/datasets.tmpl @@ -154,7 +154,7 @@ {{.i18n.Tr "repo.issues.filter_sort.downloadtimes"}} {{.i18n.Tr "repo.issues.filter_sort.moststars"}} + href="{{$.Link}}?sort=moststars&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "dataset.collection_num"}} {{.i18n.Tr "repo.issues.filter_sort.mostusecount"}} diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 82313d736..e43191470 100755 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -111,11 +111,11 @@ {{index .GetIssueInfos 1 | RenderEmoji}} {{else if or (eq .GetOpType 10) (eq .GetOpType 21) (eq .GetOpType 22) (eq .GetOpType 23)}} {{.GetIssueTitle | RenderEmoji}} -
{{index .GetIssueInfos 1 | RenderEmoji}}
+{{index .GetIssueInfos 1 | RenderEmoji}}
{{else if eq .GetOpType 11}} -{{index .GetIssueInfos 1}}
+{{index .GetIssueInfos 1}}
{{else if or (eq .GetOpType 12) (eq .GetOpType 13) (eq .GetOpType 14) (eq .GetOpType 15)}} - {{.GetIssueTitle | RenderEmoji}} + {{.GetIssueTitle | RenderEmoji}} {{end}}{{TimeSince .GetCreate $.i18n.Lang}}
diff --git a/web_src/less/_base.less b/web_src/less/_base.less old mode 100644 new mode 100755 index 951cd881e..8d7c052fe --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -489,6 +489,9 @@ code, white-space: nowrap; display: inline-block; } + &.pre-wrap{ + white-space:pre-wrap!important; + } &.thin { font-weight: normal;