oss/forgejo
oss/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-10-05 19:30:58 +00:00
Code Wiki Activity

[v12.0/forgejo] fix(ui): update i18n usage in comments (#8646)

Browse source 
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/8644

Fix regression of https://codeberg.org/forgejo/forgejo/pulls/8214 (regressing v11 feature https://codeberg.org/forgejo/forgejo/pulls/6523)

Reporeted by @Andre601.

## Preview

![bug](/attachments/0e0c4703-537f-4adc-95f7-4047710522b4)

![fixed](/attachments/07bc5824-87ae-43da-92a2-8e6e9b9cf567)

## Testing
* go to https://v13.next.forgejo.org/, log in
* create repo, add some issue labels (on `./labels`)
* create issue
* add some labels to it and then close it
* observe that what you see looks more like the 2nd screenshot than the 1st screenshot

<!--start release-notes-assistant-->

## Release notes
<!--URL:https://codeberg.org/forgejo/forgejo-->
- Bug fixes
  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8644): <!--number 8644 --><!--line 0 --><!--description Zml4KHVpKTogdXBkYXRlIGkxOG4gdXNhZ2UgaW4gY29tbWVudHM=-->fix(ui): update i18n usage in comments<!--description-->
<!--end release-notes-assistant-->

Co-authored-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8646
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
This commit is contained in:
forgejo-backport-action 2025-07-24 07:57:37 +02:00 • committed by Earl Warren
parent 5e5dac84ed
commit 8b06eb1bea
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
templates/repo/issue/view_content/comments.tmpl
View file

@ -724,18 +724,18 @@
<li>
<span class="badge tw-bg-green tw-text-white">{{svg "octicon-dot-fill"}}</span>
{{if .Issue.IsPull}}
{{ctx.Locale.Tr "repo.pulls.reopened_at" "" ""}}
{{ctx.Locale.Tr "repo.pulls.reopened_at" ""}}
{{else}}
{{ctx.Locale.Tr "repo.issues.reopened_at" "" ""}}
{{ctx.Locale.Tr "repo.issues.reopened_at" ""}}
{{end}}
</li>
{{else if and (not .Aggregator.PrevClosed) .Aggregator.IsClosed}}
<span class="badge tw-bg-red tw-text-white">{{svg "octicon-circle-slash"}}</span>
<li>
{{if .Issue.IsPull}}
{{ctx.Locale.Tr "repo.pulls.closed_at" "" ""}}
{{ctx.Locale.Tr "repo.pulls.closed_at" ""}}
{{else}}
{{ctx.Locale.Tr "repo.issues.closed_at" "" ""}}
{{ctx.Locale.Tr "repo.issues.closed_at" ""}}
{{end}}
</li>
{{end}}