Some improvements

This commit is contained in:
Lunny Xiao 2024-08-21 19:40:32 -07:00
parent 2361ec5a44
commit b4eac75dba
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
4 changed files with 15 additions and 9 deletions

View File

@ -1625,6 +1625,9 @@ issues.label.filter_sort.reverse_by_size = Largest size
issues.development = Development
issues.maybefixed = May be fixed by %s
issues.create_branch_from_issue_success = Create branch %s from issue successfully
issues.pr.completed = Completed
issues.pr.conflicted = Merge conflicts
issues.link.created = Created %s
issues.num_participants = %d Participants
issues.attachment.open_tab = `Click to see "%s" in a new tab`
issues.attachment.download = `Click to download "%s"`

View File

@ -221,7 +221,6 @@ func handleCreateBranchError(ctx *context.Context, err error, form *forms.NewBra
}
ctx.ServerError("CreateNewBranch", err)
return
}
// CreateBranch creates new branch in repository

View File

@ -11,13 +11,17 @@
</a>
</span>
<div>
Created {{DateTime "short" .PullRequest.Issue.CreatedUnix}}
{{ctx.Locale.Tr "repo.issues.link.created" (DateTime "short" .PullRequest.Issue.CreatedUnix)}}
{{if .PullRequest.HasMerged}}
Completed
{{.PullRequest.MergedCommitID}}
Created {{.PullRequest.MergedUnix}}
{{ctx.Locale.Tr "repo.issues.pr.completed"}}
</div>
<div>
{{svg "octicon-git-commit" 14}} <a href="{{.PullRequest.BaseRepo.Link}}/src/commit/{{.PullRequest.MergedCommitID}}">{{.PullRequest.MergedCommitID | ShortSha}}</a>
</div>
<div>
{{ctx.Locale.Tr "repo.issues.link.created" (DateTime "short" .PullRequest.MergedUnix)}}
{{else if .PullRequest.ChangedProtectedFiles}}
Merge conflicts
{{ctx.Locale.Tr "repo.issues.pr.conflicted"}}
{{end}}
</div>
{{else if and .Branch .DisplayBranch}}