Merge remote-tracking branch 'origin/master' into fix-15075-fix-reference-link-relative-paths

Author: zeripath

modules/convert/pull_review.go

@@ -85,19 +85,18 @@ func ToPullReviewCommentList(review *models.Review, doer *models.User) ([]*api.P
 
 	apiComments := make([]*api.PullReviewComment, 0, len(review.CodeComments))
 
-	auth := false
-	if doer != nil {
-		auth = doer.IsAdmin || doer.ID == review.ReviewerID
-	}
-
 	for _, lines := range review.CodeComments {
 		for _, comments := range lines {
 			for _, comment := range comments {
+				auth := false
+				if doer != nil {
+					auth = doer.IsAdmin || doer.ID == comment.Poster.ID
+				}
 				apiComment := &api.PullReviewComment{
 					ID:           comment.ID,
 					Body:         comment.Content,
-					Reviewer:     ToUser(review.Reviewer, doer != nil, auth),
-					ReviewID:     review.ID,
+					Reviewer:     ToUser(comment.Poster, doer != nil, auth),
+					ReviewID:     comment.PosterID,
 					Created:      comment.CreatedUnix.AsTime(),
 					Updated:      comment.UpdatedUnix.AsTime(),
 					Path:         comment.TreePath,

options/locale/locale_zh-CN.ini

@@ -2549,7 +2549,7 @@ notices.delete_success=系统通知已被删除。
 [action]
 create_repo=创建了仓库 <a href="%s">%s</a>
 rename_repo=重命名仓库 <code>%[1]s</code> 为 <a href="%[2]s">%[3]s</a>
-commit_repo=于 <a href="%[1]s">%[4]s</a> 推送了代码到 <a href="%[1]s/src/branch/%[2]s">%[3]s</a> 分支
+commit_repo=推送了 <a href="%[1]s/src/branch/%[2]s">%[3]s</a> 分支到 <a href="%[1]s">%[4]s</a>
 create_issue=`创建了工单 <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`关闭了工单 <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`重新开启了工单 <a href="%s/issues/%s">%s#%[2]s</a>`
@@ -2560,7 +2560,7 @@ comment_issue=`评论了工单 <a href="%s/issues/%s">%s#%[2]s</a>`
 comment_pull=`评论了合并请求 <a href="%s/pulls/%s">%s#%[2]s</a>`
 merge_pull_request=`合并了合并请求 <a href="%s/pulls/%s">%s#%[2]s</a>`
 transfer_repo=将仓库 <code>%s</code> 转移至 <a href="%s">%s</a>
-push_tag=于 <a href="%[1]s">%[3]s</a> 推送了标签 <a href="%s/src/tag/%s">%[2]s</a>
+push_tag=推送了标签 <a href="%s/src/tag/%s">%[2]s</a> 到 <a href="%[1]s">%[3]s</a>
 delete_tag=从<a href="%[1]s">%[3]s</a> 删除了标签 %[2]s
 delete_branch=从 <a href="%[1]s">%[3]s</a> 删除分支 %[2]s
 compare_branch=比较