Skip to content

Commit 9717675

Browse files
Localize milestone related time strings (#24051)
- With #23988 in place, we can improve these timestamps --------- Co-authored-by: silverwind <me@silverwind.io>
1 parent 8aada18 commit 9717675

File tree

5 files changed

+5
-10
lines changed

5 files changed

+5
-10
lines changed

models/issues/milestone.go

-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"context"
88
"fmt"
99
"strings"
10-
"time"
1110

1211
"code.gitea.io/gitea/models/db"
1312
repo_model "code.gitea.io/gitea/models/repo"
@@ -65,7 +64,6 @@ type Milestone struct {
6564
DeadlineString string `xorm:"-"`
6665

6766
TotalTrackedTime int64 `xorm:"-"`
68-
TimeSinceUpdate int64 `xorm:"-"`
6967
}
7068

7169
func init() {
@@ -84,9 +82,6 @@ func (m *Milestone) BeforeUpdate() {
8482
// AfterLoad is invoked from XORM after setting the value of a field of
8583
// this object.
8684
func (m *Milestone) AfterLoad() {
87-
if !m.UpdatedUnix.IsZero() {
88-
m.TimeSinceUpdate = time.Now().Unix() - m.UpdatedUnix.AsTime().Unix()
89-
}
9085
m.NumOpenIssues = m.NumIssues - m.NumClosedIssues
9186
if m.DeadlineUnix.Year() == 9999 {
9287
return

options/locale/locale_en-US.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1710,7 +1710,7 @@ pulls.delete.text = Do you really want to delete this pull request? (This will p
17101710

17111711
milestones.new = New Milestone
17121712
milestones.closed = Closed %s
1713-
milestones.update_ago = Updated %s ago
1713+
milestones.updated = Updated
17141714
milestones.no_due_date = No due date
17151715
milestones.open = Open
17161716
milestones.close = Close

templates/repo/issue/milestone_issues.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
{{else}}
3636
{{svg "octicon-calendar"}}
3737
{{if .Milestone.DeadlineString}}
38-
<span {{if .IsOverdue}}class="overdue"{{end}}>{{.Milestone.DeadlineString}}</span>
38+
<span {{if .IsOverdue}}class="overdue"{{end}}>{{template "shared/datetime/short" (dict "Datetime" .Milestone.DeadlineString "Fallback" .Milestone.DeadlineString)}}</span>
3939
{{else}}
4040
{{$.locale.Tr "repo.milestones.no_due_date"}}
4141
{{end}}

templates/repo/issue/milestones.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
{{else}}
7878
{{svg "octicon-calendar"}}
7979
{{if .DeadlineString}}
80-
<span {{if .IsOverdue}}class="overdue"{{end}}>{{.DeadlineString}}</span>
80+
<span {{if .IsOverdue}}class="overdue"{{end}}>{{template "shared/datetime/short" (dict "Datetime" .DeadlineString "Fallback" .DeadlineString)}}</span>
8181
{{else}}
8282
{{$.locale.Tr "repo.milestones.no_due_date"}}
8383
{{end}}
@@ -88,7 +88,7 @@
8888
{{svg "octicon-check" 16 "gt-mr-3"}}
8989
{{LocaleNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
9090
{{if .TotalTrackedTime}}{{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}{{end}}
91-
{{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.update_ago" (.TimeSinceUpdate|Sec2Time)}}{{end}}
91+
{{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.updated"}} {{TimeSinceUnix .UpdatedUnix $.locale}}{{end}}
9292
</span>
9393
</div>
9494
{{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}}

templates/user/dashboard/milestones.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
{{else}}
9898
{{svg "octicon-calendar"}}
9999
{{if .DeadlineString}}
100-
<span {{if .IsOverdue}}class="overdue"{{end}}>{{.DeadlineString}}</span>
100+
<span {{if .IsOverdue}}class="overdue"{{end}}>{{template "shared/datetime/short" (dict "Datetime" .DeadlineString "Fallback" .DeadlineString)}}</span>
101101
{{else}}
102102
{{$.locale.Tr "repo.milestones.no_due_date"}}
103103
{{end}}

0 commit comments

Comments
 (0)