consolidate author name across timeline (#11053)

* consolidate author name across timeline * Sync with master Co-authored-by: John Olheiser <[email protected]> Co-authored-by: guillep2k <[email protected]> Co-authored-by: techknowlogick <[email protected]>
go-gitea · Apr 19, 2020 · 0ef11ff · 0ef11ff
1 parent b57a735
commit 0ef11ff
Show file tree

Hide file tree

Showing 4 changed files with 114 additions and 63 deletions.
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -1031,8 +1031,8 @@ issues.dependency.add = Add dependency…
 issues.dependency.cancel = Cancel
 issues.dependency.remove = Remove
 issues.dependency.remove_info = Remove this dependency
-issues.dependency.added_dependency = `<a href="%[1]s">%[2]s</a> added a new dependency %[3]s`
-issues.dependency.removed_dependency = `<a href="%[1]s">%[2]s</a> removed a dependency %[3]s`
+issues.dependency.added_dependency = `added a new dependency %s`
+issues.dependency.removed_dependency = `removed a dependency %s`
 issues.dependency.issue_closing_blockedby = Closing this pull request is blocked by the following issues
 issues.dependency.pr_closing_blockedby = Closing this issue is blocked by the following issues
 issues.dependency.issue_close_blocks = This issue blocks closing of the following issues

diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
@@ -22,9 +22,21 @@
  <div class="content">
  <div class="ui top attached header">
  {{if .Issue.OriginalAuthor }}
- <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>
+ <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>
  {{else}}
- <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>
+ <span class="text grey">
+ <a class="author"{{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>
  {{end}}
  {{if not $.Repository.IsArchived}}
  <div class="ui right actions">