Merge branch 'V20220630' of git.openi.org.cn:OpenI/aiforge into multi-dataset

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

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=最少引用
 

templates/explore/datasets.tmpl

@@ -154,7 +154,7 @@
 									<a class="{{if eq .SortType "downloadtimes"}}active{{end}} item"
 										href="{{$.Link}}?sort=downloadtimes&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.downloadtimes"}}</a>
 									<a class="{{if eq .SortType "moststars"}}active{{end}} item"
-										href="{{$.Link}}?sort=moststars&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.moststars"}}</a>
+										href="{{$.Link}}?sort=moststars&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "dataset.collection_num"}}</a>
 									<a class="{{if eq .SortType "mostusecount"}}active{{end}} item"
 										href="{{$.Link}}?sort=mostusecount&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.mostusecount"}}</a>
 								</div>

templates/user/dashboard/feeds.tmpl

@@ -111,11 +111,11 @@
 						<span class="text truncate issue title">{{index .GetIssueInfos 1 | RenderEmoji}}</span>
 					{{else if or (eq .GetOpType 10) (eq .GetOpType 21) (eq .GetOpType 22) (eq .GetOpType 23)}}
 						<a href="{{.GetCommentLink}}" class="text truncate issue title">{{.GetIssueTitle | RenderEmoji}}</a>
-						<p class="text light grey">{{index .GetIssueInfos 1 | RenderEmoji}}</p>
+						<p class="text truncate pre-wrap light grey">{{index .GetIssueInfos 1 | RenderEmoji}}</p>
 					{{else if eq .GetOpType 11}}
-						<p class="text light grey">{{index .GetIssueInfos 1}}</p>
+						<p class="text truncate pre-wrap light grey">{{index .GetIssueInfos 1}}</p>
 					{{else if or (eq .GetOpType 12) (eq .GetOpType 13) (eq .GetOpType 14) (eq .GetOpType 15)}}
-						<span class="text truncate issue title">{{.GetIssueTitle | RenderEmoji}}</span>
+						<span class="text truncate pre-wrap issue title">{{.GetIssueTitle | RenderEmoji}}</span>
 					{{end}}
 					<p class="text italic light grey">{{TimeSince .GetCreate $.i18n.Lang}}</p>
 				</div>

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;