Skip to content

Commit 9ceffe9

Browse files
committed
consolidate author name across timeline
1 parent 7ac116c commit 9ceffe9

File tree

4 files changed

+113
-62
lines changed

4 files changed

+113
-62
lines changed

options/locale/locale_en-US.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,8 +1029,8 @@ issues.dependency.add = Add dependency…
10291029
issues.dependency.cancel = Cancel
10301030
issues.dependency.remove = Remove
10311031
issues.dependency.remove_info = Remove this dependency
1032-
issues.dependency.added_dependency = `<a href="%[1]s">%[2]s</a> added a new dependency %[3]s`
1033-
issues.dependency.removed_dependency = `<a href="%[1]s">%[2]s</a> removed a dependency %[3]s`
1032+
issues.dependency.added_dependency = `added a new dependency %s`
1033+
issues.dependency.removed_dependency = `removed a dependency %s`
10341034
issues.dependency.issue_closing_blockedby = Closing this pull request is blocked by the following issues
10351035
issues.dependency.pr_closing_blockedby = Closing this issue is blocked by the following issues
10361036
issues.dependency.issue_close_blocks = This issue blocks closing of the following issues

templates/repo/issue/view_content.tmpl

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,21 @@
2222
<div class="content">
2323
<div class="ui top attached header">
2424
{{if .Issue.OriginalAuthor }}
25-
<span class="text black"><i class="fa {{MigrationIcon .Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> {{ .Issue.OriginalAuthor }}</span><span class="text grey"> {{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}}</span> <span class="text migrate">{{if .Repository.OriginalURL}} ({{$.i18n.Tr "repo.migrated_from" .Repository.OriginalURL .Repository.GetOriginalURLHostname | Safe }}){{end}}</span>
25+
<span class="text black">
26+
<i class="fa {{MigrationIcon .Repository.GetOriginalURLHostname}}" aria-hidden="true"></i>
27+
{{ .Issue.OriginalAuthor }}
28+
</span>
29+
<span class="text grey">
30+
{{ .i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe }}
31+
</span>
32+
<span class="text migrate">
33+
{{if .Repository.OriginalURL}} ({{$.i18n.Tr "repo.migrated_from" .Repository.OriginalURL .Repository.GetOriginalURLHostname | Safe }}){{end}}
34+
</span>
2635
{{else}}
27-
<span class="text grey"><a {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>{{.Issue.Poster.GetDisplayName}}</a> {{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}}</span>
36+
<span class="text grey">
37+
<a class="author"{{if gt .Issue.Poster.ID 0}} href="{{.Issue.Poster.HomeLink}}"{{end}}>{{.Issue.Poster.GetDisplayName}}</a>
38+
{{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}}
39+
</span>
2840
{{end}}
2941
{{if not $.Repository.IsArchived}}
3042
<div class="ui right actions">

0 commit comments

Comments
 (0)