diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2024-12-11 10:32:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-11 13:32:10 -0500 |
| commit | 6092bbac4ded884bb8801e0c439804217d10d1f1 (patch) | |
| tree | be93dc17b00e70d057f2fb1e6e47843a7d595692 | |
| parent | e4ca557fd01a608db778e9beec51e4eedd084265 (diff) | |
| download | gitea-6092bbac4ded884bb8801e0c439804217d10d1f1.tar.gz gitea-6092bbac4ded884bb8801e0c439804217d10d1f1.zip | |
🐛 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 <105607989+SimonPistache@users.noreply.github.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
| -rw-r--r-- | options/locale/locale_en-US.ini | 2 | ||||
| -rw-r--r-- | templates/repo/issue/filter_actions.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/issue/milestone/select_menu.tmpl | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 21dee015f5..a9608144a3 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1434,8 +1434,6 @@ issues.new.no_items = No items issues.new.milestone = Milestone issues.new.no_milestone = No 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.clear_assignees = Clear assignees issues.new.no_assignees = No Assignees diff --git a/templates/repo/issue/filter_actions.tmpl b/templates/repo/issue/filter_actions.tmpl index 56ae7dc411..08838567bb 100644 --- a/templates/repo/issue/filter_actions.tmpl +++ b/templates/repo/issue/filter_actions.tmpl @@ -58,7 +58,7 @@ {{end}} {{if .ClosedMilestones}} <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}} <div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/milestone"> {{.Name}} diff --git a/templates/repo/issue/milestone/select_menu.tmpl b/templates/repo/issue/milestone/select_menu.tmpl index 9b0492ce52..6ddc4590d8 100644 --- a/templates/repo/issue/milestone/select_menu.tmpl +++ b/templates/repo/issue/milestone/select_menu.tmpl @@ -14,7 +14,7 @@ {{if .OpenMilestones}} <div class="divider"></div> <div class="header"> - {{ctx.Locale.Tr "repo.issues.new.open_milestone"}} + {{ctx.Locale.Tr "repo.issues.filter_milestone_open"}} </div> {{range .OpenMilestones}} <a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> @@ -26,7 +26,7 @@ {{if .ClosedMilestones}} <div class="divider"></div> <div class="header"> - {{ctx.Locale.Tr "repo.issues.new.closed_milestone"}} + {{ctx.Locale.Tr "repo.issues.filter_milestone_closed"}} </div> {{range .ClosedMilestones}} <a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> |