GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[TEMPLATES][I18N] Fixup use of trans filter, in favour of trans tags. These are much more flexible and facilitate parameterized translations, rather than using concats. The only appropriate use of the trans filter is when a whole string in a variable needs to be translated (which should probably be avoided anyway)

Browse Source
This commit is contained in:
Hugo Sales
2022-03-01 11:27:19 +00:00
parent 0b864e85fd
commit b3374333f3
25 changed files with 93 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/TreeNotes/TreeNotes.php
View File

@@ -72,7 +72,7 @@ class TreeNotes extends Plugin
'replies' => array_map(
fn ($n) => [
'note' => $n,
'replies' => [],
'replies' => [], // We want only one depth level
'show_more' => ($n->getRepliesCount() > $max_replies_to_show),
'total_replies' => $n->getRepliesCount(),
],

6
plugins/TreeNotes/templates/tree_notes/note_replies_block.html.twig
View File

@@ -1,10 +1,10 @@
{% import '/cards/macros/note/factory.html.twig' as NoteFactory %}
<section class="note-replies" title="{{ 'Replies to ' | trans }}{{ nickname }}{{ '\'s note' | trans }}">
<section class="note-replies" title="{% trans %}Replies to %nickname%'s note{% endtrans %}">
<div class="note-replies-start"></div>
<div class="u-in-reply-to replies">
{% for reply in conversation.replies %}
<span class="note-replies-indicator" role="presentation"></span>
{% set args = reply | merge({ 'type': 'vanilla_full' }) %}
{% set args = reply | merge({ 'type': 'vanilla_full'}) %}
{{ NoteFactory.constructor(args) }}
{% endfor %}
{% if conversation.show_more %}
@@ -16,4 +16,4 @@
</a>
{% endif %}
</div>
</section>
</section>