Docker/forgejo
Docker/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-07 02:45:22 +02:00
Code Issues Releases Activity

fix(ui): issue comment anchor on time stamp

Browse source
This commit is contained in:
Robert Wolff 2025-06-17 23:33:56 +02:00
parent adc273e3a8
commit 1879ce8efe
2 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

22
options/locale/locale_en-US.ini
View file

@ -1693,15 +1693,13 @@ issues.close_comment_issue = Close with comment
issues.reopen_issue = Reopen issues.reopen_issue = Reopen
issues.reopen_comment_issue = Reopen with comment issues.reopen_comment_issue = Reopen with comment
issues.create_comment = Comment issues.create_comment = Comment
issues.closed_at = `closed this issue <a id="%[1]s" href="#%[1]s">%[2]s</a>` issues.closed_at = `closed this issue %s`
issues.reopened_at = `reopened this issue <a id="%[1]s" href="#%[1]s">%[2]s</a>` issues.reopened_at = `reopened this issue %s`
issues.commit_ref_at = `referenced this issue from a commit <a id="%[1]s" href="#%[1]s">%[2]s</a>` issues.commit_ref_at = `referenced this issue from a commit %s`
issues.ref_issue_from = `<a href="%[3]s">referenced this issue %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>` issues.ref_issue_from = `<a href="%[2]s">referenced this issue %[3]s</a> %[1]s`
issues.ref_pull_from = `<a href="%[3]s">referenced this pull request %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>` issues.ref_pull_from = `<a href="%[2]s">referenced this pull request %[3]s</a> %[1]s`
issues.ref_closing_from = `<a href="%[3]s">referenced this issue from a pull request %[4]s that will close it</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>` issues.ref_closing_from = `<a href="%[2]s">referenced this issue from a pull request %[3]s that will close it</a>, %[1]s`
issues.ref_reopening_from = `<a href="%[3]s">referenced this issue from a pull request %[4]s that will reopen it</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>` issues.ref_reopening_from = `<a href="%[2]s">referenced this issue from a pull request %[3]s that will reopen it</a>, %[1]s`
issues.ref_closed_from = `<a href="%[3]s">closed this issue %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
issues.ref_reopened_from = `<a href="%[3]s">reopened this issue %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
issues.ref_from = `from %[1]s` issues.ref_from = `from %[1]s`
issues.author = Author issues.author = Author
issues.author.tooltip.issue = This user is the author of this issue. issues.author.tooltip.issue = This user is the author of this issue.
@ -2013,9 +2011,9 @@ pulls.update_branch_success = Branch update was successful
pulls.update_not_allowed = You are not allowed to update branch pulls.update_not_allowed = You are not allowed to update branch
pulls.outdated_with_base_branch = This branch is out-of-date with the base branch pulls.outdated_with_base_branch = This branch is out-of-date with the base branch
pulls.close = Close pull request pulls.close = Close pull request
pulls.closed_at = `closed this pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>` pulls.closed_at = `closed this pull request %s`
pulls.reopened_at = `reopened this pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>` pulls.reopened_at = `reopened this pull request %s`
pulls.commit_ref_at = `referenced this pull request from a commit <a id="%[1]s" href="#%[1]s">%[2]s</a>` pulls.commit_ref_at = `referenced this pull request from a commit %s`
pulls.cmd_instruction_hint = View command line instructions pulls.cmd_instruction_hint = View command line instructions
pulls.cmd_instruction_checkout_title = Checkout pulls.cmd_instruction_checkout_title = Checkout
pulls.cmd_instruction_checkout_desc = From your project repository, check out a new branch and test the changes. pulls.cmd_instruction_checkout_desc = From your project repository, check out a new branch and test the changes.

17
templates/repo/issue/view_content/comments.tmpl
View file

@ -1,7 +1,7 @@
{{template "base/alert"}} {{template "base/alert"}}
{{range .Issue.Comments}} {{range .Issue.Comments}}
{{if call $.ShouldShowCommentType .Type}} {{if call $.ShouldShowCommentType .Type}}
{{$createdStr:= DateUtils.TimeSince .CreatedUnix}} {{$createdStr := HTMLFormat `<a id="%s" href="#%s">%s</a>` .EventTag .HashTag (DateUtils.TimeSince .CreatedUnix)}}
<!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF, <!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF,
5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 8 = MILESTONE_CHANGE, 5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 8 = MILESTONE_CHANGE,
@ -87,9 +87,9 @@
<span class="text grey muted-links"> <span class="text grey muted-links">
{{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}} {{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}}
{{if .Issue.IsPull}} {{if .Issue.IsPull}}
{{ctx.Locale.Tr "repo.pulls.reopened_at" .EventTag $createdStr}} {{ctx.Locale.Tr "repo.pulls.reopened_at" $createdStr}}
{{else}} {{else}}
{{ctx.Locale.Tr "repo.issues.reopened_at" .EventTag $createdStr}} {{ctx.Locale.Tr "repo.issues.reopened_at" $createdStr}}
{{end}} {{end}}
</span> </span>
</div> </div>
@ -102,9 +102,9 @@
<span class="text grey muted-links"> <span class="text grey muted-links">
{{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}} {{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}}
{{if .Issue.IsPull}} {{if .Issue.IsPull}}
{{ctx.Locale.Tr "repo.pulls.closed_at" .EventTag $createdStr}} {{ctx.Locale.Tr "repo.pulls.closed_at" $createdStr}}
{{else}} {{else}}
{{ctx.Locale.Tr "repo.issues.closed_at" .EventTag $createdStr}} {{ctx.Locale.Tr "repo.issues.closed_at" $createdStr}}
{{end}} {{end}}
</span> </span>
</div> </div>
@ -137,14 +137,13 @@
{{else if eq .RefAction 2}} {{else if eq .RefAction 2}}
{{$refTr = "repo.issues.ref_reopening_from"}} {{$refTr = "repo.issues.ref_reopening_from"}}
{{end}} {{end}}
{{$createdStr:= DateUtils.TimeSince .CreatedUnix}}
<div class="timeline-item event" id="{{.HashTag}}"> <div class="timeline-item event" id="{{.HashTag}}">
<span class="badge">{{svg "octicon-bookmark"}}</span> <span class="badge">{{svg "octicon-bookmark"}}</span>
{{template "shared/user/avatarlink" dict "user" .Poster}} {{template "shared/user/avatarlink" dict "user" .Poster}}
{{if eq .RefAction 3}}<del>{{end}} {{if eq .RefAction 3}}<del>{{end}}
<span class="text grey muted-links"> <span class="text grey muted-links">
{{template "shared/user/authorlink" .Poster}} {{template "shared/user/authorlink" .Poster}}
{{ctx.Locale.Tr $refTr .EventTag $createdStr (.RefCommentLink ctx) $refFrom}} {{ctx.Locale.Tr $refTr $createdStr (.RefCommentLink ctx) $refFrom}}
</span> </span>
{{if eq .RefAction 3}}</del>{{end}} {{if eq .RefAction 3}}</del>{{end}}
@ -159,9 +158,9 @@
<span class="text grey muted-links"> <span class="text grey muted-links">
{{template "shared/user/authorlink" .Poster}} {{template "shared/user/authorlink" .Poster}}
{{if .Issue.IsPull}} {{if .Issue.IsPull}}
{{ctx.Locale.Tr "repo.pulls.commit_ref_at" .EventTag $createdStr}} {{ctx.Locale.Tr "repo.pulls.commit_ref_at" $createdStr}}
{{else}} {{else}}
{{ctx.Locale.Tr "repo.issues.commit_ref_at" .EventTag $createdStr}} {{ctx.Locale.Tr "repo.issues.commit_ref_at" $createdStr}}
{{end}} {{end}}
</span> </span>
<div class="detail flex-text-block"> <div class="detail flex-text-block">