Skip to content
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

Jump to bottom

Change Close to either Close issue or Close pull request #23506

Merged
merged 9 commits into from
Mar 16, 2023
Merged

Change Close to either Close issue or Close pull request #23506

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a7212e7
Change `Close` to either `Close issue` or `Close pull request`
yardenshoham Mar 15, 2023
40230f8
Update templates/repo/issue/view_content.tmpl
yardenshoham Mar 16, 2023
09eb312
Update templates/repo/issue/view_content.tmpl
yardenshoham Mar 16, 2023
2bd4143
Use title case
yardenshoham Mar 16, 2023
1b3f37e
Merge branch 'main' into closed
yardenshoham Mar 16, 2023
887c7b0
Rename `issues.close_issue` to `issues.close`
yardenshoham Mar 16, 2023
b56530f
Merge branch 'main' into closed
yardenshoham Mar 16, 2023
57ed6bf
Trigger rebuild
yardenshoham Mar 16, 2023
3f81451
Trigger rebuild again (please pass)
yardenshoham Mar 16, 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
3 changes: 2 additions & 1 deletion options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1369,7 +1369,7 @@ issues.context.reference_issue = Reference in New Issue
issues.context.edit = Edit
issues.context.delete = Delete
issues.no_content = There is no content yet.
issues.close_issue = Close
issues.close_issue = Close issue
yardenshoham marked this conversation as resolved.
Show resolved Hide resolved
issues.pull_merged_at = `merged commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> into <b>%[3]s</b> %[4]s`
issues.manually_pull_merged_at = `merged commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> into <b>%[3]s</b> manually %[4]s`
issues.close_comment_issue = Comment and Close
Expand Down Expand Up @@ -1654,6 +1654,7 @@ pulls.update_branch_rebase = Update branch by rebase
pulls.update_branch_success = Branch update was successful
pulls.update_not_allowed = You are not allowed to update branch
pulls.outdated_with_base_branch = This branch is out-of-date with the base branch
pulls.close = Close pull request
pulls.closed_at = `closed this pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
pulls.reopened_at = `reopened this pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
pulls.merge_instruction_hint = `You can also view <a class="show-instruction">command line instructions</a>.`
Expand Down
12 changes: 12 additions & 0 deletions templates/repo/issue/view_content.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,15 @@
{{.locale.Tr "repo.issues.reopen_issue"}}
</button>
{{else}}
{{if .Issue.IsPull}}
<button id="status-button" class="ui red basic button" tabindex="6" data-status="{{.locale.Tr "repo.pulls.close"}}" data-status-and-comment="{{.locale.Tr "repo.issues.close_comment_issue"}}" data-status-val="close">
{{.locale.Tr "repo.pulls.close"}}
</button>
{{else}}
<button id="status-button" class="ui red basic button" tabindex="6" data-status="{{.locale.Tr "repo.issues.close_issue"}}" data-status-and-comment="{{.locale.Tr "repo.issues.close_comment_issue"}}" data-status-val="close">
{{.locale.Tr "repo.issues.close_issue"}}
</button>
{{end}}
yardenshoham marked this conversation as resolved.
Show resolved Hide resolved
{{end}}
{{end}}
<button class="ui green button loading-button" tabindex="5">
Expand Down Expand Up @@ -167,9 +173,15 @@
{{.locale.Tr "repo.issues.reopen_issue"}}
</button>
{{else}}
{{if .Issue.IsPull}}
<button id="status-button" class="ui red basic button" tabindex="6" data-status="{{.locale.Tr "repo.pulls.close"}}" data-status-and-comment="{{.locale.Tr "repo.issues.close_comment_issue"}}" data-status-val="close">
{{.locale.Tr "repo.pulls.close"}}
</button>
{{else}}
<button id="status-button" class="ui red basic button" tabindex="6" data-status="{{.locale.Tr "repo.issues.close_issue"}}" data-status-and-comment="{{.locale.Tr "repo.issues.close_comment_issue"}}" data-status-val="close">
{{.locale.Tr "repo.issues.close_issue"}}
</button>
{{end}}
yardenshoham marked this conversation as resolved.
Show resolved Hide resolved
{{end}}
{{end}}
<button class="ui green button loading-button" tabindex="5">
Expand Down