Skip to content

Add locale for deleted head branch #26296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 3, 2023
Merged

Add locale for deleted head branch #26296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3563cd0
locale
yp05327 Aug 3, 2023
6cb4dca
Update options/locale/locale_en-US.ini
yp05327 Aug 3, 2023
c51148f
Merge branch 'main' into add-locale-for-deleted-head-branch
GiteaBot Aug 3, 2023
417e7eb
Merge branch 'main' into add-locale-for-deleted-head-branch
GiteaBot Aug 3, 2023
654f2ac
Merge branch 'main' into add-locale-for-deleted-head-branch
GiteaBot Aug 3, 2023
0508b34
Merge branch 'main' into add-locale-for-deleted-head-branch
GiteaBot Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1784,6 +1784,8 @@ pulls.delete.text = Do you really want to delete this pull request? (This will p

pulls.recently_pushed_new_branches = You pushed on branch <strong>%[1]s</strong> %[2]s

pull.deleted_branch = (deleted):%s

milestones.new = New Milestone
milestones.closed = Closed %s
milestones.update_ago = Updated %s
Expand Down
4 changes: 2 additions & 2 deletions routers/web/repo/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C
if pull.IsSameRepo() {
ctx.Data["HeadTarget"] = pull.HeadBranch
} else if pull.HeadRepo == nil {
ctx.Data["HeadTarget"] = "<deleted>:" + pull.HeadBranch
ctx.Data["HeadTarget"] = ctx.Locale.Tr("repo.pull.deleted_branch", pull.HeadBranch)
} else {
ctx.Data["HeadTarget"] = pull.HeadRepo.OwnerName + ":" + pull.HeadBranch
}
Expand Down Expand Up @@ -654,7 +654,7 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C
if pull.IsSameRepo() {
ctx.Data["HeadTarget"] = pull.HeadBranch
} else if pull.HeadRepo == nil {
ctx.Data["HeadTarget"] = "<deleted>:" + pull.HeadBranch
ctx.Data["HeadTarget"] = ctx.Locale.Tr("repo.pull.deleted_branch", pull.HeadBranch)
} else {
ctx.Data["HeadTarget"] = pull.HeadRepo.OwnerName + ":" + pull.HeadBranch
}
Expand Down