diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl index fd9f69aec7d..6483ec800c4 100644 --- a/templates/admin/auth/list.tmpl +++ b/templates/admin/auth/list.tmpl @@ -1,7 +1,7 @@ {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin authentication")}}

- {{ctx.Locale.Tr "admin.auths.auth_manage_panel"}} ({{.locale.Tr "admin.total" .Total}}) + {{ctx.Locale.Tr "admin.auths.auth_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}})
{{ctx.Locale.Tr "admin.auths.new"}}
diff --git a/templates/admin/cron.tmpl b/templates/admin/cron.tmpl index 1886b48d0d5..af30cc06e15 100644 --- a/templates/admin/cron.tmpl +++ b/templates/admin/cron.tmpl @@ -26,7 +26,7 @@ {{DateTime "full" .Next}} {{if gt .Prev.Year 1}}{{DateTime "full" .Prev}}{{else}}-{{end}} {{.ExecTimes}} - {{if eq .Status ""}}—{{else if eq .Status "finished"}}{{svg "octicon-check" 16}}{{else}}{{svg "octicon-x" 16}}{{end}} + {{if eq .Status ""}}—{{else if eq .Status "finished"}}{{svg "octicon-check" 16}}{{else}}{{svg "octicon-x" 16}}{{end}} {{end}} diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index 89ea849da9e..84afc0585f6 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -1,7 +1,7 @@ {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}

- {{ctx.Locale.Tr "admin.emails.email_manage_panel"}} ({{.locale.Tr "admin.total" .Total}}) + {{ctx.Locale.Tr "admin.emails.email_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}})

diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index 8fc602096da..ed410425b57 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -1,7 +1,7 @@ {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin notice")}}

- {{ctx.Locale.Tr "admin.notices.system_notice_list"}} ({{.locale.Tr "admin.total" .Total}}) + {{ctx.Locale.Tr "admin.notices.system_notice_list"}} ({{ctx.Locale.Tr "admin.total" .Total}})

diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index 97b2678c81b..1c041ca3473 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -1,7 +1,7 @@ {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}

- {{ctx.Locale.Tr "admin.orgs.org_manage_panel"}} ({{.locale.Tr "admin.total" .Total}}) + {{ctx.Locale.Tr "admin.orgs.org_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}})
{{ctx.Locale.Tr "admin.orgs.new_orga"}}
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index 85b44a6a94e..c67797d6b0c 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -1,7 +1,7 @@ {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}

- {{ctx.Locale.Tr "admin.packages.package_manage_panel"}} ({{.locale.Tr "admin.total" .TotalCount}}, + {{ctx.Locale.Tr "admin.packages.package_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .TotalCount}}, {{ctx.Locale.Tr "admin.packages.total_size" (FileSize .TotalBlobSize)}}, {{ctx.Locale.Tr "admin.packages.unreferenced_size" (FileSize .TotalUnreferencedBlobSize)}})
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index 1c60536c962..c23b6a1b630 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -1,7 +1,7 @@ {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin")}}

- {{ctx.Locale.Tr "admin.repos.repo_manage_panel"}} ({{.locale.Tr "admin.total" .Total}}) + {{ctx.Locale.Tr "admin.repos.repo_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}})
{{ctx.Locale.Tr "admin.repos.unadopted"}}
diff --git a/templates/admin/stacktrace-row.tmpl b/templates/admin/stacktrace-row.tmpl index b0e282bcc71..ffb8bf812f3 100644 --- a/templates/admin/stacktrace-row.tmpl +++ b/templates/admin/stacktrace-row.tmpl @@ -13,7 +13,7 @@

{{.Process.Description}}
-
{{if ne .Process.Type "none"}}{{TimeSince .Process.Start .root.locale}}{{end}}
+
{{if ne .Process.Type "none"}}{{TimeSince .Process.Start ctx.Locale}}{{end}}
{{if or (eq .Process.Type "request") (eq .Process.Type "normal")}} diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 350c82fcf88..fba67fac156 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -1,7 +1,7 @@ {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}

- {{ctx.Locale.Tr "admin.users.user_manage_panel"}} ({{.locale.Tr "admin.total" .Total}}) + {{ctx.Locale.Tr "admin.users.user_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}})
{{ctx.Locale.Tr "admin.users.new_account"}}
diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl index e9991fdb490..f0a7865602f 100644 --- a/templates/base/footer_content.tmpl +++ b/templates/base/footer_content.tmpl @@ -16,10 +16,10 @@

- {{svg "octicon-globe" 14}} {{.locale.LangName}} + {{svg "octicon-globe" 14}} {{ctx.Locale.LangName}}
{{range .AllLangs}} - {{.Name}} + {{.Name}} {{end}}
diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 319f392f325..effe4dcea9f 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -6,14 +6,14 @@
{{if and .PageIsExploreRepositories .OnlyShowRelevant}}
- {{.locale.Tr "explore.relevant_repositories" ((print $.Link "?only_show_relevant=0")|Escape) | Safe}} + {{ctx.Locale.Tr "explore.relevant_repositories" ((print $.Link "?only_show_relevant=0")|Escape) | Safe}}
{{end}}
diff --git a/templates/home.tmpl b/templates/home.tmpl index 0d9b948071f..78364431e9b 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
diff --git a/templates/install.tmpl b/templates/install.tmpl index d90a9b5827f..e9b267fa1c2 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -205,73 +205,73 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index bbd2fb0ece7..31c0d85d89e 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -9,7 +9,7 @@
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 96f9571b1b1..0178a20fbb6 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -7,7 +7,7 @@
{{.CsrfTokenHtml}}

- {{if .PageIsOrgTeamsNew}}{{ctx.Locale.Tr "org.create_new_team"}}{{else}}{{.locale.Tr "org.teams.settings"}}{{end}} + {{if .PageIsOrgTeamsNew}}{{ctx.Locale.Tr "org.create_new_team"}}{{else}}{{ctx.Locale.Tr "org.teams.settings"}}{{end}}

{{template "base/alert" .}} diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index e419de4b127..5a32eea64fa 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -20,8 +20,8 @@
- - + +
{{end}} diff --git a/templates/package/shared/cleanup_rules/edit.tmpl b/templates/package/shared/cleanup_rules/edit.tmpl index f1fe9d13782..8729494412b 100644 --- a/templates/package/shared/cleanup_rules/edit.tmpl +++ b/templates/package/shared/cleanup_rules/edit.tmpl @@ -1,4 +1,4 @@ -

{{if .IsEditRule}}{{ctx.Locale.Tr "packages.owner.settings.cleanuprules.edit"}}{{else}}{{.locale.Tr "packages.owner.settings.cleanuprules.add"}}{{end}}

+

{{if .IsEditRule}}{{ctx.Locale.Tr "packages.owner.settings.cleanuprules.edit"}}{{else}}{{ctx.Locale.Tr "packages.owner.settings.cleanuprules.add"}}{{end}}

{{.CsrfTokenHtml}} diff --git a/templates/package/shared/cleanup_rules/list.tmpl b/templates/package/shared/cleanup_rules/list.tmpl index 91a613576a8..6505c8f9a51 100644 --- a/templates/package/shared/cleanup_rules/list.tmpl +++ b/templates/package/shared/cleanup_rules/list.tmpl @@ -20,7 +20,7 @@
{{if .KeepCount}}
- {{ctx.Locale.Tr "packages.owner.settings.cleanuprules.keep.count"}}: {{if eq .KeepCount 1}}{{ctx.Locale.Tr "packages.owner.settings.cleanuprules.keep.count.1"}}{{else}}{{$.locale.Tr "packages.owner.settings.cleanuprules.keep.count.n" .KeepCount}}{{end}} + {{ctx.Locale.Tr "packages.owner.settings.cleanuprules.keep.count"}}: {{if eq .KeepCount 1}}{{ctx.Locale.Tr "packages.owner.settings.cleanuprules.keep.count.1"}}{{else}}{{ctx.Locale.Tr "packages.owner.settings.cleanuprules.keep.count.n" .KeepCount}}{{end}}
{{end}} {{if .KeepPattern}} diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 249ba8c53c5..af79490f4dd 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -22,7 +22,7 @@ {{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}}
- {{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}} + {{$timeStr := TimeSinceUnix .Version.CreatedUnix ctx.Locale}} {{$hasRepositoryAccess := false}} {{if .Repository}} {{$hasRepositoryAccess = index $.RepositoryAccessMap .Repository.ID}} diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index 18b4916f4ac..71a1557ffba 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -25,7 +25,7 @@
{{.Version.LowerVersion}}
- {{ctx.Locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} + {{ctx.Locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix ctx.Locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}}
diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl index 8856dbf9305..bee4d4e56cf 100644 --- a/templates/package/view.tmpl +++ b/templates/package/view.tmpl @@ -8,7 +8,7 @@

{{.PackageDescriptor.Package.Name}} ({{.PackageDescriptor.Version.Version}})

- {{$timeStr := TimeSinceUnix .PackageDescriptor.Version.CreatedUnix $.locale}} + {{$timeStr := TimeSinceUnix .PackageDescriptor.Version.CreatedUnix ctx.Locale}} {{if .HasRepositoryAccess}} {{ctx.Locale.Tr "packages.published_by_in" $timeStr .PackageDescriptor.Creator.HomeLink (.PackageDescriptor.Creator.GetDisplayName | Escape) .PackageDescriptor.Repository.Link (.PackageDescriptor.Repository.FullName | Escape) | Safe}} {{else}} @@ -47,7 +47,7 @@ {{if .HasRepositoryAccess}}
{{svg "octicon-repo" 16 "gt-mr-3"}} {{.PackageDescriptor.Repository.FullName}}
{{end}} -
{{svg "octicon-calendar" 16 "gt-mr-3"}} {{TimeSinceUnix .PackageDescriptor.Version.CreatedUnix $.locale}}
+
{{svg "octicon-calendar" 16 "gt-mr-3"}} {{TimeSinceUnix .PackageDescriptor.Version.CreatedUnix ctx.Locale}}
{{svg "octicon-download" 16 "gt-mr-3"}} {{.PackageDescriptor.Version.DownloadCount}}
{{template "package/metadata/alpine" .}} {{template "package/metadata/cargo" .}} diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 6726a969628..36c8bb19dd1 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -3,11 +3,11 @@
{{svg "octicon-project-symlink" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} + {{ctx.Locale.PrettyNumber .OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} {{svg "octicon-check" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .ClosedCount}} {{ctx.Locale.Tr "repo.issues.closed_title"}} + {{ctx.Locale.PrettyNumber .ClosedCount}} {{ctx.Locale.Tr "repo.issues.closed_title"}}
@@ -54,11 +54,11 @@
{{svg "octicon-issue-opened" 14}} - {{$.locale.PrettyNumber .NumOpenIssues}} {{ctx.Locale.Tr "repo.issues.open_title"}} + {{ctx.Locale.PrettyNumber .NumOpenIssues}} {{ctx.Locale.Tr "repo.issues.open_title"}}
{{svg "octicon-check" 14}} - {{$.locale.PrettyNumber .NumClosedIssues}} {{ctx.Locale.Tr "repo.issues.closed_title"}} + {{ctx.Locale.PrettyNumber .NumClosedIssues}} {{ctx.Locale.Tr "repo.issues.closed_title"}}
{{if and $.CanWriteProjects (not $.Repository.IsArchived)}} diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index 9e0f0051a0c..aa6d66fa686 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -69,7 +69,7 @@ {{svg "octicon-kebab-horizontal"}}
- {{if .CurWorkflowDisabled}}{{ctx.Locale.Tr "actions.workflow.enable"}}{{else}}{{.locale.Tr "actions.workflow.disable"}}{{end}} + {{if .CurWorkflowDisabled}}{{ctx.Locale.Tr "actions.workflow.enable"}}{{else}}{{ctx.Locale.Tr "actions.workflow.disable"}}{{end}}
diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index df8dba03091..37b19f0bdc3 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -2,7 +2,7 @@ {{if eq (len .Runs) 0}}
{{svg "octicon-no-entry" 48}} -

{{if $.IsFiltered}}{{ctx.Locale.Tr "actions.runs.no_results"}}{{else}}{{.locale.Tr "actions.runs.no_runs"}}{{end}}

+

{{if $.IsFiltered}}{{ctx.Locale.Tr "actions.runs.no_results"}}{{else}}{{ctx.Locale.Tr "actions.runs.no_runs"}}{{end}}

{{end}} {{range .Runs}} @@ -34,7 +34,7 @@ {{end}}
-
{{svg "octicon-calendar" 16}}{{TimeSinceUnix .Updated $.locale}}
+
{{svg "octicon-calendar" 16}}{{TimeSinceUnix .Updated ctx.Locale}}
{{svg "octicon-stopwatch" 16}}{{.Duration}}
diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index 252ca0264d9..fe592c00005 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -128,7 +128,7 @@ {{if not .IsTag}} {{.Title | RenderEmoji $.Context}} {{end}} - {{TimeSinceUnix .CreatedUnix $.locale}} + {{TimeSinceUnix .CreatedUnix ctx.Locale}}

{{end}}
@@ -147,7 +147,7 @@

{{ctx.Locale.Tr "repo.activity.merged_prs_label"}} #{{.Index}} {{.Issue.Title | RenderEmoji $.Context}} - {{TimeSinceUnix .MergedUnix $.locale}} + {{TimeSinceUnix .MergedUnix ctx.Locale}}

{{end}}
@@ -166,7 +166,7 @@

{{ctx.Locale.Tr "repo.activity.opened_prs_label"}} #{{.Index}} {{.Issue.Title | RenderEmoji $.Context}} - {{TimeSinceUnix .Issue.CreatedUnix $.locale}} + {{TimeSinceUnix .Issue.CreatedUnix ctx.Locale}}

{{end}}
@@ -185,7 +185,7 @@

{{ctx.Locale.Tr "repo.activity.closed_issue_label"}} #{{.Index}} {{.Title | RenderEmoji $.Context}} - {{TimeSinceUnix .ClosedUnix $.locale}} + {{TimeSinceUnix .ClosedUnix ctx.Locale}}

{{end}}
@@ -204,7 +204,7 @@

{{ctx.Locale.Tr "repo.activity.new_issue_label"}} #{{.Index}} {{.Title | RenderEmoji $.Context}} - {{TimeSinceUnix .CreatedUnix $.locale}} + {{TimeSinceUnix .CreatedUnix ctx.Locale}}

{{end}}
@@ -225,7 +225,7 @@ {{else}} {{.Title | RenderEmoji $.Context}} {{end}} - {{TimeSinceUnix .UpdatedUnix $.locale}} + {{TimeSinceUnix .UpdatedUnix ctx.Locale}}

{{end}}

diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index b883589bf79..36d1b628c9d 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -27,7 +27,7 @@ {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DefaultBranchBranch.DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DefaultBranchBranch.DBBranch.CommitID)}}

-

{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DefaultBranchBranch.DBBranch.CommitMessage .RepoLink .Repository.ComposeMetas}} · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.DBBranch.CommitTime.AsTime .locale}}{{if .DefaultBranchBranch.DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}

+

{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DefaultBranchBranch.DBBranch.CommitMessage .RepoLink .Repository.ComposeMetas}} · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DefaultBranchBranch.DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}

{{if .Committer}} - + {{else}} - + {{end}} {{end}} diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 4ee321cc0a3..054a3f6bec8 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -19,7 +19,7 @@ - + {{else if .IsDiffCompare}} {{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch"}}{{else if .BaseIsTag}}{{svg "octicon-tag"}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}} diff --git a/templates/repo/diff/blob_excerpt.tmpl b/templates/repo/diff/blob_excerpt.tmpl index feb2aa5738e..2dff28a9657 100644 --- a/templates/repo/diff/blob_excerpt.tmpl +++ b/templates/repo/diff/blob_excerpt.tmpl @@ -21,10 +21,10 @@ {{end}} - {{else}} - {{$inlineDiff := $.section.GetComputedInlineDiffFor $line $.locale}} + {{$inlineDiff := $.section.GetComputedInlineDiffFor $line ctx.Locale}} @@ -71,7 +71,7 @@ {{end}} - {{$inlineDiff := $.section.GetComputedInlineDiffFor $line $.locale}} + {{$inlineDiff := $.section.GetComputedInlineDiffFor $line ctx.Locale}} diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 0ec268f0657..15766363e74 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -2,7 +2,7 @@
{{if not .DiffNotAvailable}} -
{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}} @@ -79,7 +79,7 @@
- + @@ -95,7 +95,7 @@ {{.DBBranch.Name}} -

{{ctx.Locale.Tr "repo.branch.deleted_by" .DBBranch.DeletedBy.Name}} {{TimeSinceUnix .DBBranch.DeletedUnix $.locale}}

+

{{ctx.Locale.Tr "repo.branch.deleted_by" .DBBranch.DeletedBy.Name}} {{TimeSinceUnix .DBBranch.DeletedUnix ctx.Locale}}

{{else}} {{if .IsProtected}} {{svg "octicon-shield-lock"}} @@ -105,7 +105,7 @@ {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}} -

{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DBBranch.CommitMessage $.RepoLink $.Repository.ComposeMetas}} · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DBBranch.CommitTime.AsTime $.locale}}{{if .DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}}  {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}

+

{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DBBranch.CommitMessage $.RepoLink $.Repository.ComposeMetas}} · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}}  {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}

{{end}} 		diff --git a/templates/repo/clone_buttons.tmpl b/templates/repo/clone_buttons.tmpl index 78f2c340807..a664c4bda8d 100644 --- a/templates/repo/clone_buttons.tmpl +++ b/templates/repo/clone_buttons.tmpl @@ -10,6 +10,6 @@ {{end}} - diff --git a/templates/repo/code/recently_pushed_new_branches.tmpl b/templates/repo/code/recently_pushed_new_branches.tmpl index 8ed751fe804..8910a9e5b60 100644 --- a/templates/repo/code/recently_pushed_new_branches.tmpl +++ b/templates/repo/code/recently_pushed_new_branches.tmpl @@ -1,7 +1,7 @@ {{range .RecentlyPushedNewBranches}}
- {{$timeSince := TimeSince .CommitTime.AsTime $.locale}} + {{$timeSince := TimeSince .CommitTime.AsTime ctx.Locale}} {{ctx.Locale.Tr "repo.pulls.recently_pushed_new_branches" (Escape .Name) $timeSince | Safe}}
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index fe944e95ed1..e0a63f30415 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -53,13 +53,13 @@ data-modal-cherry-pick-type="revert" data-modal-cherry-pick-header="{{ctx.Locale.Tr "repo.commit.revert-header" (ShortSha .CommitID)}}" data-modal-cherry-pick-content="{{ctx.Locale.Tr "repo.commit.revert-content"}}" - data-modal-cherry-pick-submit="{{ctx.Locale.Tr "repo.commit.revert"}}">{{.locale.Tr "repo.commit.revert"}}
+ data-modal-cherry-pick-submit="{{ctx.Locale.Tr "repo.commit.revert"}}">{{ctx.Locale.Tr "repo.commit.revert"}}
{{.locale.Tr "repo.commit.cherry-pick"}}
+ data-modal-cherry-pick-submit="{{ctx.Locale.Tr "repo.commit.cherry-pick"}}">{{ctx.Locale.Tr "repo.commit.cherry-pick"}} 		{{TimeSince .Committer.When $.locale}}{{TimeSince .Committer.When ctx.Locale}}{{TimeSince .Author.When $.locale}}{{TimeSince .Author.When ctx.Locale}}
{{$inlineDiff := $.section.GetComputedInlineDiffFor $line $.locale}}{{/* + {{$inlineDiff := $.section.GetComputedInlineDiffFor $line ctx.Locale}}{{/* */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}} {{if and $line.LeftIdx $inlineDiff.EscapeStatus.Escaped}}{{end}} {{if $line.LeftIdx}}{{end}} {{if $inlineDiff.EscapeStatus.Escaped}}{{end}} {{$inlineDiff.Content}}