Merge branch 'V20220630' 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=最少引用
 

routers/api/v1/repo/repo_dashbord.go

@@ -887,19 +887,12 @@ func getTimePeroid(ctx *context.Context, recordBeginTime time.Time) (time.Time,
 		if queryType == "all" {
 			beginTime = recordBeginTimeTemp
 			endTime = now
-		} else if queryType == "today" {
+		} else if queryType == "yesterday" {
 			endTime = now
 			beginTime = time.Date(endTime.Year(), endTime.Month(), endTime.Day(), 0, 0, 0, 0, now.Location())
-		} else if queryType == "yesterday" {
-			endTime = time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
-			beginTime = endTime.AddDate(0, 0, -1)
 
-		} else if queryType == "last_7day" {
-			beginTime = now.AddDate(0, 0, -7)
-			beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location())
-			endTime = now
-		} else if queryType == "last_30day" {
-			beginTime = now.AddDate(0, 0, -30)
+		} else if queryType == "current_week" {
+			beginTime = now.AddDate(0, 0, -int(time.Now().Weekday())+2) //begin from monday
 			beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location())
 			endTime = now
 		} else if queryType == "current_month" {

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>