Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-18 11:03:04 +01:00
Code Issues Activity

🐛 Fixe a keystring misuse and refactor duplicates keystrings (#32668) (#32792)

Browse Source 
Backport #32668 

- Fixes a translation keystring misuse where the string 'open
milestones' is used in place of 'closed milestones'.
- De-duplicates the use of 'open milesones' and 'closed milestones'
keystrings on the sidebar of an issue, reusing the ones on the issues
filter and action bars.
- Closes #32667

Co-authored-by: Simon Pistache <105607989+SimonPistache@users.noreply.github.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Lunny Xiao 2024-12-11 10:32:10 -08:00 committed by GitHub
parent e4ca557fd0
commit 6092bbac4d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
options/locale/locale_en-US.ini
View File

@ -1434,8 +1434,6 @@ issues.new.no_items = No items
issues.new.milestone = Milestone issues.new.milestone = Milestone
issues.new.no_milestone = No Milestone issues.new.no_milestone = No Milestone
issues.new.clear_milestone = Clear milestone issues.new.clear_milestone = Clear milestone
issues.new.open_milestone = Open Milestones
issues.new.closed_milestone = Closed Milestones
issues.new.assignees = Assignees issues.new.assignees = Assignees
issues.new.clear_assignees = Clear assignees issues.new.clear_assignees = Clear assignees
issues.new.no_assignees = No Assignees issues.new.no_assignees = No Assignees

2
templates/repo/issue/filter_actions.tmpl
View File

@ -58,7 +58,7 @@
{{end}} {{end}}
{{if .ClosedMilestones}} {{if .ClosedMilestones}}
<div class="divider"></div> <div class="divider"></div>
<div class="header">{{ctx.Locale.Tr "repo.issues.filter_milestone_open"}}</div> <div class="header">{{ctx.Locale.Tr "repo.issues.filter_milestone_closed"}}</div>
{{range .ClosedMilestones}} {{range .ClosedMilestones}}
<div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/milestone"> <div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/milestone">
{{.Name}} {{.Name}}

4
templates/repo/issue/milestone/select_menu.tmpl
View File

@ -14,7 +14,7 @@
{{if .OpenMilestones}} {{if .OpenMilestones}}
<div class="divider"></div> <div class="divider"></div>
<div class="header"> <div class="header">
{{ctx.Locale.Tr "repo.issues.new.open_milestone"}} {{ctx.Locale.Tr "repo.issues.filter_milestone_open"}}
</div> </div>
{{range .OpenMilestones}} {{range .OpenMilestones}}
<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> <a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}">
@ -26,7 +26,7 @@
{{if .ClosedMilestones}} {{if .ClosedMilestones}}
<div class="divider"></div> <div class="divider"></div>
<div class="header"> <div class="header">
{{ctx.Locale.Tr "repo.issues.new.closed_milestone"}} {{ctx.Locale.Tr "repo.issues.filter_milestone_closed"}}
</div> </div>
{{range .ClosedMilestones}} {{range .ClosedMilestones}}
<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> <a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}">