Skip to content

Commit 7f6220c

Browse files
wxiaoguangwxiaoguang
committed
replace DateTime
1 parent 58eb16e commit 7f6220c

33 files changed

+73
-37
lines changed

‎modules/templates/helper.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ func NewFuncMap() template.FuncMap {
5454
"StringUtils": NewStringUtils,
5555
"SliceUtils": NewSliceUtils,
5656
"JsonUtils": NewJsonUtils,
57+
"DateUtils": NewDateUtils, // TODO: to be replaced by DateUtils
5758

5859
// -----------------------------------------------------------------
5960
// svg / avatar / icon / color

‎modules/templates/util_date.go

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// Copyright 2024 The Gitea Authors. All rights reserved.
2+
// SPDX-License-Identifier: MIT
3+
4+
package templates
5+
6+
import (
7+
"context"
8+
"html/template"
9+
10+
"code.gitea.io/gitea/modules/timeutil"
11+
)
12+
13+
type DateUtils struct {
14+
ctx context.Context
15+
}
16+
17+
func NewDateUtils(ctx context.Context) *DateUtils {
18+
return &DateUtils{ctx}
19+
}
20+
21+
// AbsoluteShort renders in "Jan 01, 2006" format
22+
func (du *DateUtils) AbsoluteShort(time any) template.HTML {
23+
return timeutil.DateTime("short", time)
24+
}
25+
26+
// AbsoluteLong renders in "January 01, 2006" format
27+
func (du *DateUtils) AbsoluteLong(time any) template.HTML {
28+
return timeutil.DateTime("short", time)
29+
}
30+
31+
// FullTime renders in "Jan 01, 2006 20:33:44" format
32+
func (du *DateUtils) FullTime(time any) template.HTML {
33+
return timeutil.DateTime("full", time)
34+
}

‎routers/web/repo/activity.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ func Activity(ctx *context.Context) {
4848
ctx.Data["Period"] = "weekly"
4949
timeFrom = timeUntil.Add(-time.Hour * 168)
5050
}
51-
ctx.Data["DateFrom"] = timeFrom.UTC().Format(time.RFC3339)
52-
ctx.Data["DateUntil"] = timeUntil.UTC().Format(time.RFC3339)
51+
ctx.Data["DateFrom"] = timeFrom
52+
ctx.Data["DateUntil"] = timeUntil
5353
ctx.Data["PeriodText"] = ctx.Tr("repo.activity.period." + ctx.Data["Period"].(string))
5454

5555
var err error

‎services/context/context.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ func NewTemplateContextForWeb(ctx *Context) TemplateContext {
100100
tmplCtx := NewTemplateContext(ctx)
101101
tmplCtx["Locale"] = ctx.Base.Locale
102102
tmplCtx["AvatarUtils"] = templates.NewAvatarUtils(ctx)
103+
tmplCtx["DateUtils"] = templates.NewDateUtils(ctx)
103104
tmplCtx["RootData"] = ctx.Data
104105
tmplCtx["Consts"] = map[string]any{
105106
"RepoUnitTypeCode": unit.TypeCode,

‎templates/admin/auth/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
<td><a href="{{AppSubUrl}}/-/admin/auths/{{.ID}}">{{.Name}}</a></td>
2727
<td>{{.TypeName}}</td>
2828
<td>{{svg (Iif .IsActive "octicon-check" "octicon-x")}}</td>
29-
<td>{{DateTime "short" .UpdatedUnix}}</td>
30-
<td>{{DateTime "short" .CreatedUnix}}</td>
29+
<td>{{ctx.DateUtils.AbsoluteShort .UpdatedUnix}}</td>
30+
<td>{{ctx.DateUtils.AbsoluteShort .CreatedUnix}}</td>
3131
<td><a href="{{AppSubUrl}}/-/admin/auths/{{.ID}}">{{svg "octicon-pencil"}}</a></td>
3232
</tr>
3333
{{end}}

‎templates/admin/cron.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<td><button type="submit" class="ui primary button" name="op" value="{{.Name}}" title="{{ctx.Locale.Tr "admin.dashboard.operation_run"}}">{{svg "octicon-triangle-right"}}</button></td>
2424
<td>{{ctx.Locale.Tr (printf "admin.dashboard.%s" .Name)}}</td>
2525
<td>{{.Spec}}</td>
26-
<td>{{DateTime "full" .Next}}</td>
27-
<td>{{if gt .Prev.Year 1}}{{DateTime "full" .Prev}}{{else}}-{{end}}</td>
26+
<td>{{ctx.DateUtils.FullTime .Next}}</td>
27+
<td>{{if gt .Prev.Year 1}}{{ctx.DateUtils.FullTime .Prev}}{{else}}-{{end}}</td>
2828
<td>{{.ExecTimes}}</td>
2929
<td {{if ne .Status ""}}data-tooltip-content="{{.FormatLastMessage ctx.Locale}}"{{end}} >{{if eq .Status ""}}—{{else}}{{svg (Iif (eq .Status "finished") "octicon-check" "octicon-x") 16}}{{end}}</td>
3030
</tr>

‎templates/admin/notice.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<td>{{.ID}}</td>
2222
<td>{{ctx.Locale.Tr .TrStr}}</td>
2323
<td class="view-detail auto-ellipsis tw-w-4/5"><span class="notice-description">{{.Description}}</span></td>
24-
<td nowrap>{{DateTime "short" .CreatedUnix}}</td>
24+
<td nowrap>{{ctx.DateUtils.AbsoluteShort .CreatedUnix}}</td>
2525
<td class="view-detail"><a href="#">{{svg "octicon-note" 16}}</a></td>
2626
</tr>
2727
{{end}}

‎templates/admin/org/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<td>{{.NumTeams}}</td>
6464
<td>{{.NumMembers}}</td>
6565
<td>{{.NumRepos}}</td>
66-
<td>{{DateTime "short" .CreatedUnix}}</td>
66+
<td>{{ctx.DateUtils.AbsoluteShort .CreatedUnix}}</td>
6767
<td><a href="{{.OrganisationLink}}/settings" data-tooltip-content="{{ctx.Locale.Tr "edit"}}">{{svg "octicon-pencil"}}</a></td>
6868
</tr>
6969
{{end}}

‎templates/admin/packages/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
{{end}}
7272
</td>
7373
<td>{{FileSize .CalculateBlobSize}}</td>
74-
<td>{{DateTime "short" .Version.CreatedUnix}}</td>
74+
<td>{{ctx.DateUtils.AbsoluteShort .Version.CreatedUnix}}</td>
7575
<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.Version.ID}}" data-name="{{.Package.Name}}" data-data-version="{{.Version.Version}}">{{svg "octicon-trash"}}</a></td>
7676
</tr>
7777
{{end}}

‎templates/admin/repo/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
<td>{{.NumIssues}}</td>
8383
<td>{{FileSize .GitSize}}</td>
8484
<td>{{FileSize .LFSSize}}</td>
85-
<td>{{DateTime "short" .UpdatedUnix}}</td>
86-
<td>{{DateTime "short" .CreatedUnix}}</td>
85+
<td>{{ctx.DateUtils.AbsoluteShort .UpdatedUnix}}</td>
86+
<td>{{ctx.DateUtils.AbsoluteShort .CreatedUnix}}</td>
8787
<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.ID}}" data-name="{{.Name}}">{{svg "octicon-trash"}}</a></td>
8888
</tr>
8989
{{end}}

‎templates/admin/user/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@
9696
<td>{{svg (Iif .IsActive "octicon-check" "octicon-x")}}</td>
9797
<td>{{svg (Iif .IsRestricted "octicon-check" "octicon-x")}}</td>
9898
<td>{{svg (Iif (index $.UsersTwoFaStatus .ID) "octicon-check" "octicon-x")}}</td>
99-
<td>{{DateTime "short" .CreatedUnix}}</td>
99+
<td>{{ctx.DateUtils.AbsoluteShort .CreatedUnix}}</td>
100100
{{if .LastLoginUnix}}
101-
<td>{{DateTime "short" .LastLoginUnix}}</td>
101+
<td>{{ctx.DateUtils.AbsoluteShort .LastLoginUnix}}</td>
102102
{{else}}
103103
<td><span>{{ctx.Locale.Tr "admin.users.never_login"}}</span></td>
104104
{{end}}

‎templates/explore/user_list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<a href="mailto:{{.Email}}">{{.Email}}</a>
2222
</span>
2323
{{end}}
24-
<span class="flex-text-inline">{{svg "octicon-calendar"}}{{ctx.Locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix)}}</span>
24+
<span class="flex-text-inline">{{svg "octicon-calendar"}}{{ctx.Locale.Tr "user.joined_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}}</span>
2525
</div>
2626
</div>
2727
</div>

‎templates/package/shared/cleanup_rules/preview.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<td><a href="{{.VersionWebLink}}">{{.Version.Version}}</a></td>
2323
<td><a href="{{.Creator.HomeLink}}">{{.Creator.Name}}</a></td>
2424
<td>{{FileSize .CalculateBlobSize}}</td>
25-
<td>{{DateTime "short" .Version.CreatedUnix}}</td>
25+
<td>{{ctx.DateUtils.AbsoluteShort .Version.CreatedUnix}}</td>
2626
</tr>
2727
{{else}}
2828
<tr>

‎templates/package/view.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
{{range .LatestVersions}}
9393
<div class="item tw-flex">
9494
<a class="tw-flex-1 gt-ellipsis" title="{{.Version}}" href="{{$.PackageDescriptor.PackageWebLink}}/{{PathEscape .LowerVersion}}">{{.Version}}</a>
95-
<span class="text small">{{DateTime "short" .CreatedUnix}}</span>
95+
<span class="text small">{{ctx.DateUtils.AbsoluteShort .CreatedUnix}}</span>
9696
</div>
9797
{{end}}
9898
</div>

‎templates/repo/diff/compare.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
{{if .Repository.ArchivedUnix.IsZero}}
205205
{{ctx.Locale.Tr "repo.archive.title"}}
206206
{{else}}
207-
{{ctx.Locale.Tr "repo.archive.title_date" (DateTime "long" .Repository.ArchivedUnix)}}
207+
{{ctx.Locale.Tr "repo.archive.title_date" (ctx.DateUtils.AbsoluteLong .Repository.ArchivedUnix)}}
208208
{{end}}
209209
</div>
210210
{{end}}

‎templates/repo/empty.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{{if .Repository.ArchivedUnix.IsZero}}
1111
{{ctx.Locale.Tr "repo.archive.title"}}
1212
{{else}}
13-
{{ctx.Locale.Tr "repo.archive.title_date" (DateTime "long" .Repository.ArchivedUnix)}}
13+
{{ctx.Locale.Tr "repo.archive.title_date" (ctx.DateUtils.AbsoluteLong .Repository.ArchivedUnix)}}
1414
{{end}}
1515
</div>
1616
{{end}}

‎templates/repo/graph/commits.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
{{$userName}}
7070
{{end}}
7171
</span>
72-
<span class="time tw-flex tw-items-center">{{DateTime "full" $commit.Date}}</span>
72+
<span class="time tw-flex tw-items-center">{{ctx.DateUtils.FullTime $commit.Date}}</span>
7373
{{end}}
7474
</li>
7575
{{end}}

‎templates/repo/home.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
{{if .Repository.ArchivedUnix.IsZero}}
3838
{{ctx.Locale.Tr "repo.archive.title"}}
3939
{{else}}
40-
{{ctx.Locale.Tr "repo.archive.title_date" (DateTime "long" .Repository.ArchivedUnix)}}
40+
{{ctx.Locale.Tr "repo.archive.title_date" (ctx.DateUtils.AbsoluteLong .Repository.ArchivedUnix)}}
4141
{{end}}
4242
</div>
4343
{{end}}

‎templates/repo/issue/view_content/sidebar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@
368368
<div class="tw-flex tw-justify-between tw-items-center">
369369
<div class="due-date {{if .Issue.IsOverdue}}text red{{end}}" {{if .Issue.IsOverdue}}data-tooltip-content="{{ctx.Locale.Tr "repo.issues.due_date_overdue"}}"{{end}}>
370370
{{svg "octicon-calendar" 16 "tw-mr-2"}}
371-
{{DateTime "long" .Issue.DeadlineUnix.FormatDate}}
371+
{{ctx.DateUtils.AbsoluteLong .Issue.DeadlineUnix}}
372372
</div>
373373
<div>
374374
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}

‎templates/repo/pulse.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<h2 class="ui header activity-header">
2-
<span>{{DateTime "long" .DateFrom}} - {{DateTime "long" .DateUntil}}</span>
2+
<span>{{ctx.DateUtils.AbsoluteLong .DateFrom}} - {{ctx.DateUtils.AbsoluteLong .DateUntil}}</span>
33
<!-- Period -->
44
<div class="ui floating dropdown jump filter">
55
<div class="ui basic compact button">

‎templates/repo/settings/deploy_keys.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
{{.Fingerprint}}
5656
</div>
5757
<div class="flex-item-body">
58-
<i>{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="text green"{{end}}>{{DateTime "short" .UpdatedUnix}}</span>{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}} - <span>{{ctx.Locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{ctx.Locale.Tr "settings.can_write_info"}} {{end}}</span></i>
58+
<i>{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="text green"{{end}}>{{ctx.DateUtils.AbsoluteShort .UpdatedUnix}}</span>{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}} - <span>{{ctx.Locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{ctx.Locale.Tr "settings.can_write_info"}} {{end}}</span></i>
5959
</div>
6060
</div>
6161
<div class="flex-item-trailing">

‎templates/repo/settings/options.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<tr>
118118
<td>{{.PullMirror.RemoteAddress}}</td>
119119
<td>{{ctx.Locale.Tr "repo.settings.mirror_settings.direction.pull"}}</td>
120-
<td>{{DateTime "full" .PullMirror.UpdatedUnix}}</td>
120+
<td>{{ctx.DateUtils.FullTime .PullMirror.UpdatedUnix}}</td>
121121
<td class="right aligned">
122122
<form method="post" class="tw-inline-block">
123123
{{.CsrfTokenHtml}}
@@ -205,7 +205,7 @@
205205
<tr>
206206
<td class="tw-break-anywhere">{{.RemoteAddress}}</td>
207207
<td>{{ctx.Locale.Tr "repo.settings.mirror_settings.direction.push"}}</td>
208-
<td>{{if .LastUpdateUnix}}{{DateTime "full" .LastUpdateUnix}}{{else}}{{ctx.Locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label" data-tooltip-content="{{.LastError}}">{{ctx.Locale.Tr "error"}}</div>{{end}}</td>
208+
<td>{{if .LastUpdateUnix}}{{ctx.DateUtils.FullTime .LastUpdateUnix}}{{else}}{{ctx.Locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label" data-tooltip-content="{{.LastError}}">{{ctx.Locale.Tr "error"}}</div>{{end}}</td>
209209
<td class="right aligned">
210210
<button
211211
class="ui tiny button show-modal"

‎templates/repo/user_cards.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
{{else if .Location}}
1919
{{svg "octicon-location"}} {{.Location}}
2020
{{else}}
21-
{{svg "octicon-calendar"}} {{ctx.Locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix)}}
21+
{{svg "octicon-calendar"}} {{ctx.Locale.Tr "user.joined_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}}
2222
{{end}}
2323
</div>
2424
</li>

‎templates/shared/issuelist.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<span class="due-date flex-text-inline" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.due_date"}}">
118118
<span{{if .IsOverdue}} class="text red"{{end}}>
119119
{{svg "octicon-calendar" 14}}
120-
{{DateTime "short" (.DeadlineUnix.FormatDate)}}
120+
{{ctx.DateUtils.AbsoluteShort .DeadlineUnix}}
121121
</span>
122122
</span>
123123
{{end}}

‎templates/shared/secrets/add_list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</div>
2929
<div class="flex-item-trailing">
3030
<span class="color-text-light-2">
31-
{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}}
31+
{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}}
3232
</span>
3333
<button class="ui btn interact-bg link-action tw-p-2"
3434
data-url="{{$.Link}}/delete?id={{.ID}}"

‎templates/shared/user/profile_big_avatar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
</li>
8080
{{end}}
8181
{{end}}
82-
<li>{{svg "octicon-calendar"}} <span>{{ctx.Locale.Tr "user.joined_on" (DateTime "short" .ContextUser.CreatedUnix)}}</span></li>
82+
<li>{{svg "octicon-calendar"}} <span>{{ctx.Locale.Tr "user.joined_on" (ctx.DateUtils.AbsoluteShort .ContextUser.CreatedUnix)}}</span></li>
8383
{{if and .Orgs .HasOrgsVisible}}
8484
<li>
8585
<ul class="user-orgs">

‎templates/shared/variables/variable_list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</div>
3131
<div class="flex-item-trailing">
3232
<span class="color-text-light-2">
33-
{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}}
33+
{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}}
3434
</span>
3535
<button class="btn interact-bg tw-p-2 show-modal"
3636
data-tooltip-content="{{ctx.Locale.Tr "actions.variables.edit"}}"

‎templates/user/settings/applications.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</ul>
3737
</details>
3838
<div class="flex-item-body">
39-
<i>{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="text green"{{end}}>{{DateTime "short" .UpdatedUnix}}</span>{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}</i>
39+
<i>{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="text green"{{end}}>{{ctx.DateUtils.AbsoluteShort .UpdatedUnix}}</span>{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}</i>
4040
</div>
4141
</div>
4242
<div class="flex-item-trailing">

‎templates/user/settings/grants_oauth2.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<div class="flex-item-main">
1515
<div class="flex-item-title">{{.Application.Name}}</div>
1616
<div class="flex-item-body">
17-
<i>{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}}</i>
17+
<i>{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}}</i>
1818
</div>
1919
</div>
2020
<div class="flex-item-trailing">

‎templates/user/settings/keys_gpg.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
<b>{{ctx.Locale.Tr "settings.subkeys"}}:</b> {{range .SubsKey}} {{.PaddedKeyID}} {{end}}
6464
</div>
6565
<div class="flex-item-body">
66-
<i>{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .AddedUnix)}}</i>
66+
<i>{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .AddedUnix)}}</i>
6767
-
68-
<i>{{if not .ExpiredUnix.IsZero}}{{ctx.Locale.Tr "settings.valid_until_date" (DateTime "short" .ExpiredUnix)}}{{else}}{{ctx.Locale.Tr "settings.valid_forever"}}{{end}}</i>
68+
<i>{{if not .ExpiredUnix.IsZero}}{{ctx.Locale.Tr "settings.valid_until_date" (ctx.DateUtils.AbsoluteShort .ExpiredUnix)}}{{else}}{{ctx.Locale.Tr "settings.valid_forever"}}{{end}}</i>
6969
</div>
7070
</div>
7171
<div class="flex-item-trailing">

‎templates/user/settings/keys_principal.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<div class="flex-item-main">
2323
<div class="flex-item-title">{{.Name}}</div>
2424
<div class="flex-item-body">
25-
<i>{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}} — {{svg "octicon-info" 16}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{DateTime "short" .UpdatedUnix}}</span>{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}</i>
25+
<i>{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}} — {{svg "octicon-info" 16}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{ctx.DateUtils.AbsoluteShort .UpdatedUnix}}</span>{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}</i>
2626
</div>
2727
</div>
2828
<div class="flex-item-trailing">

‎templates/user/settings/keys_ssh.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
{{.Fingerprint}}
5454
</div>
5555
<div class="flex-item-body">
56-
<i>{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="text green"{{end}}>{{DateTime "short" .UpdatedUnix}}</span>{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}</i>
56+
<i>{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="text green"{{end}}>{{ctx.DateUtils.AbsoluteShort .UpdatedUnix}}</span>{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}</i>
5757
</div>
5858
</div>
5959
<div class="flex-item-trailing">

‎templates/user/settings/security/webauthn.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<div class="flex-item-main">
1313
<div class="flex-item-title">{{.Name}}</div>
1414
<div class="flex-item-body">
15-
<i>{{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}}</i>
15+
<i>{{ctx.Locale.Tr "settings.added_on" (ctx.DateUtils.AbsoluteShort .CreatedUnix)}}</i>
1616
</div>
1717
</div>
1818
<div class="flex-item-trailing">

0 commit comments

Comments
 (0)