bjoernager/forgejo
bjoernager/forgejo
1
Fork 0
Code Issues Pull requests Activity

feat(repo,locale): merge PR/issues cases for some repo/issue strings (#7092)

Browse source 
- Merge `archive.nocomment` and `comment.blocked_by_user`'s variants for issue and pull request to a unified string and no longer have a issue and pull request variant.
- Fixes #6443

Signed-off-by: Ellen Emilia Anna Zscheile <fogti+devel@ytrizja.de>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7092
Reviewed-by: Panagiotis "Ivory" Vasilopoulos <git@n0toose.net>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: Ellen Emilia Anna Zscheile <fogti+devel@ytrizja.de>
Co-committed-by: Ellen Emilia Anna Zscheile <fogti+devel@ytrizja.de>
This commit is contained in:
Ellen Emilia Anna Zscheile 2025-03-30 21:58:34 +00:00 • committed by Gusted
parent 3769259c93
commit b0dd490ae1
5 changed files with 11 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

18
templates/repo/issue/view_content.tmpl
View file

@ -116,29 +116,17 @@
</div>
{{else if .Repository.IsArchived}}
<div class="ui warning message tw-text-center">
{{if .Issue.IsPull}}
{{ctx.Locale.Tr "repo.archive.pull.nocomment"}}
{{else}}
{{ctx.Locale.Tr "repo.archive.issue.nocomment"}}
{{end}}
{{ctx.Locale.Tr "repo.archive.nocomment"}}
</div>
{{end}}
{{else if .IsBlocked}}
<div class="ui warning message">
{{if .Issue.IsPull}}
{{ctx.Locale.Tr "repo.pulls.comment.blocked_by_user"}}
{{else}}
{{ctx.Locale.Tr "repo.issues.comment.blocked_by_user"}}
{{end}}
{{ctx.Locale.Tr "repo.comment.blocked_by_user"}}
</div>
{{else}} {{/* not .IsSigned */}}
{{if .Repository.IsArchived}}
<div class="ui warning message tw-text-center">
{{if .Issue.IsPull}}
{{ctx.Locale.Tr "repo.archive.pull.nocomment"}}
{{else}}
{{ctx.Locale.Tr "repo.archive.issue.nocomment"}}
{{end}}
{{ctx.Locale.Tr "repo.archive.nocomment"}}
</div>
{{else}}
<div class="ui warning message">