tdsds.com/gitea
tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-22 16:44:26 +00:00
Code Releases Activity

fix(#32667): 🐛 Fixe a keystring misuse and refactor duplicates keystrings (#32668)

Browse Source 
- 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: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Simon Pistache 2024-12-01 03:14:56 +01:00 committed by GitHub
parent 79d593a9be
commit 2abef971dc
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

@ -1461,8 +1461,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/sidebar/milestone_list.tmpl
View File

@ -22,7 +22,7 @@
<div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_milestone"}}</div> <div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_milestone"}}</div>
<div class="scrolling menu"> <div class="scrolling menu">
{{if $data.OpenMilestones}} {{if $data.OpenMilestones}}
<div class="header">{{ctx.Locale.Tr "repo.issues.new.open_milestone"}}</div> <div class="header">{{ctx.Locale.Tr "repo.issues.filter_milestone_open"}}</div>
{{range $data.OpenMilestones}} {{range $data.OpenMilestones}}
<a class="item muted" data-value="{{.ID}}" href="{{$pageMeta.RepoLink}}/issues?milestone={{.ID}}"> <a class="item muted" data-value="{{.ID}}" href="{{$pageMeta.RepoLink}}/issues?milestone={{.ID}}">
{{svg "octicon-milestone" 18}} {{.Name}} {{svg "octicon-milestone" 18}} {{.Name}}
@ -31,7 +31,7 @@
{{end}} {{end}}
{{if and $data.OpenMilestones $data.ClosedMilestones}}<div class="divider"></div>{{end}} {{if and $data.OpenMilestones $data.ClosedMilestones}}<div class="divider"></div>{{end}}
{{if $data.ClosedMilestones}} {{if $data.ClosedMilestones}}
<div class="header">{{ctx.Locale.Tr "repo.issues.new.closed_milestone"}}</div> <div class="header">{{ctx.Locale.Tr "repo.issues.filter_milestone_closed"}}</div>
{{range $data.ClosedMilestones}} {{range $data.ClosedMilestones}}
<a class="item muted" data-value="{{.ID}}" href="{{$pageMeta.RepoLink}}/issues?milestone={{.ID}}"> <a class="item muted" data-value="{{.ID}}" href="{{$pageMeta.RepoLink}}/issues?milestone={{.ID}}">
{{svg "octicon-milestone" 18}} {{.Name}} {{svg "octicon-milestone" 18}} {{.Name}}