From 2019983e77895b4e41724bfa3297f5dd730ff37d Mon Sep 17 00:00:00 2001 From: "oscar.lofwenhamn" <44643697+oscarlofwenhamn@users.noreply.github.com> Date: Wed, 27 Mar 2019 23:22:39 +0100 Subject: Make "Ghost" not link to 404 page (#6410) * Make Ghost not link to 404 page * Make correct localization label show * Create and use GetLastEventLabelFake for when a Ghost user has made the action, thus not linking to a user profile * Add corresponding _fake entries to locale_en-US * Make Ghost avatar not link to 404 page * Make Ghost on milestone_issues not link to 404 page --- templates/user/dashboard/feeds.tmpl | 6 +++++- templates/user/dashboard/issues.tmpl | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'templates/user') diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 849ad7fb2f..ffc0db3317 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -7,7 +7,11 @@

- {{.ShortActUserName}} + {{if gt .ActUser.ID 0}} + {{.ShortActUserName}} + {{else}} + {{.ShortActUserName}} + {{end}} {{if eq .GetOpType 1}} {{$.i18n.Tr "action.create_repo" .GetRepoLink .ShortRepoPath | Str2html}} {{else if eq .GetOpType 2}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index b5990e61e0..93286df578 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -86,7 +86,11 @@ {{end}}

- {{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeLink .Poster.Name | Safe}} + {{if gt .Poster.ID 0}} + {{$.i18n.Tr .GetLastEventLabel $timeStr .Poster.HomeLink .Poster.Name | Safe}} + {{else}} + {{$.i18n.Tr .GetLastEventLabelFake $timeStr .Poster.Name | Safe}} + {{end}} {{if .Assignee}} -- cgit v1.2.3