Skip to content

Commit 6092bba

Browse files
lunnySimonPistachewxiaoguang
authored
🐛 Fixe a keystring misuse and refactor duplicates keystrings (#32668) (#32792)
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 <[email protected]> Co-authored-by: wxiaoguang <[email protected]>
1 parent e4ca557 commit 6092bba

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

options/locale/locale_en-US.ini

-2
Original file line numberDiff line numberDiff line change
@@ -1434,8 +1434,6 @@ issues.new.no_items = No items
14341434
issues.new.milestone = Milestone
14351435
issues.new.no_milestone = No Milestone
14361436
issues.new.clear_milestone = Clear milestone
1437-
issues.new.open_milestone = Open Milestones
1438-
issues.new.closed_milestone = Closed Milestones
14391437
issues.new.assignees = Assignees
14401438
issues.new.clear_assignees = Clear assignees
14411439
issues.new.no_assignees = No Assignees

templates/repo/issue/filter_actions.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
{{end}}
5959
{{if .ClosedMilestones}}
6060
<div class="divider"></div>
61-
<div class="header">{{ctx.Locale.Tr "repo.issues.filter_milestone_open"}}</div>
61+
<div class="header">{{ctx.Locale.Tr "repo.issues.filter_milestone_closed"}}</div>
6262
{{range .ClosedMilestones}}
6363
<div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/milestone">
6464
{{.Name}}

templates/repo/issue/milestone/select_menu.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
{{if .OpenMilestones}}
1515
<div class="divider"></div>
1616
<div class="header">
17-
{{ctx.Locale.Tr "repo.issues.new.open_milestone"}}
17+
{{ctx.Locale.Tr "repo.issues.filter_milestone_open"}}
1818
</div>
1919
{{range .OpenMilestones}}
2020
<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}">
@@ -26,7 +26,7 @@
2626
{{if .ClosedMilestones}}
2727
<div class="divider"></div>
2828
<div class="header">
29-
{{ctx.Locale.Tr "repo.issues.new.closed_milestone"}}
29+
{{ctx.Locale.Tr "repo.issues.filter_milestone_closed"}}
3030
</div>
3131
{{range .ClosedMilestones}}
3232
<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}">

0 commit comments

Comments
 (0)