aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-02-02 15:09:33 -05:00
Code

Fix wording when user is unassigned from an issue ()

Browse Source 
Previous Gitea would display that the user had unassigned themselves even if the actor
was not the user. Fixes
This commit is contained in:
Lanre Adelowo 2019-01-19 20:16:46 +01:00 committed by zeripath
parent 905e63f5b5
commit c212c98463
2 changed files with 7 additions and 2 deletions
options/locale
locale_en-US.ini
templates/repo/issue/view_content
comments.tmpl

3
options/locale/locale_en-US.ini

@ -692,7 +692,8 @@ issues.remove_milestone_at = `removed this from the <b>%s</b> milestone %s`
issues.deleted_milestone = `(deleted)` issues.deleted_milestone = `(deleted)`
issues.self_assign_at = `self-assigned this %s` issues.self_assign_at = `self-assigned this %s`
issues.add_assignee_at = `was assigned by <b>%s</b> %s` issues.add_assignee_at = `was assigned by <b>%s</b> %s`
issues.remove_assignee_at = `removed their assignment %s` issues.remove_assignee_at = `was unassigned by <b>%s</b> %s`
issues.remove_self_assignment = `removed their assignment %s`
issues.change_title_at = `changed title from <b>%s</b> to <b>%s</b> %s` issues.change_title_at = `changed title from <b>%s</b> to <b>%s</b> %s`
issues.delete_branch_at = `deleted branch <b>%s</b> %s` issues.delete_branch_at = `deleted branch <b>%s</b> %s`
issues.open_tab = %d Open issues.open_tab = %d Open

6
templates/repo/issue/view_content/comments.tmpl

@ -124,7 +124,11 @@
</a> </a>
<span class="text grey"> <span class="text grey">
<a href="{{.Assignee.HomeLink}}">{{.Assignee.Name}}</a> <a href="{{.Assignee.HomeLink}}">{{.Assignee.Name}}</a>
{{$.i18n.Tr "repo.issues.remove_assignee_at" $createdStr | Safe}} {{ if eq .Poster.ID .Assignee.ID }}
{{$.i18n.Tr "repo.issues.remove_self_assignment" $createdStr | Safe}}
{{ else }}
{{$.i18n.Tr "repo.issues.remove_assignee_at" .Poster.Name $createdStr | Safe}}
{{ end }}
</span> </span>
{{else}} {{else}}
<a class="ui avatar image" href="{{.Assignee.HomeLink}}"> <a class="ui avatar image" href="{{.Assignee.HomeLink}}">