From 6b82708968f5d8696606820ac2bffb407589a09f Mon Sep 17 00:00:00 2001
From: Eliseu Amaro <mail@eliseuama.ro>
Date: Wed, 29 Dec 2021 17:54:02 +0000
Subject: [PATCH] [CARDS][Note] AppendCardNote event overhaul

[PLUGINS][Favourite] Added complementary information on user action

[COMPONENTS][Conversation] Fixed AppendCardNote issue where cached query
would only act on Notes with depth > 1
---
 templates/cards/note/view.html.twig | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/templates/cards/note/view.html.twig b/templates/cards/note/view.html.twig
index c8ca887e77..899c5d5b8e 100644
--- a/templates/cards/note/view.html.twig
+++ b/templates/cards/note/view.html.twig
@@ -134,21 +134,30 @@
 
             {{ block('note_replies') }}
 
-
             {% for complementary_info in handle_event('AppendCardNote', {'note': note }) %}
             <aside title="{{ 'Note\'s complementary information' | trans }}" class="note-complementary">
+                {% set actor_count = complementary_info['actors'] | length %}
+                {% set counter = 0 %}
                 {% for complementary_info_actor in complementary_info['actors'] %}
                     {% if complementary_info_actor is defined %}
-                        <a href="{{ complementary_info_actor.getUrl() }}">{{ complementary_info_actor.getNickname() }}</a>
+                        <a href="{{ complementary_info_actor.getUrl() }}">{{complementary_info_actor.getNickname()}}{% if actor_count > 1 and counter < actor_count - 2 %}{{', ' | trans }}{% endif %}</a>
+                        {% if counter == actor_count - 2 %}
+                            {{ ' and ' | trans }}
+                        {% endif %}
                     {% endif %}
+                    {% set counter = counter + 1 %}
                 {% endfor %}
                 {% if complementary_info['action'] is defined and not null %}
-                    {{ ' has ' ~ complementary_info['action'] ~ ' this note' | trans }}
+                    {% if counter > 1 %}
+                        {{ ' have ' | trans }}
+                    {% else %}
+                        {{ ' has ' | trans }}
+                    {% endif %}
+                    {{ complementary_info['action'] ~ ' this note' | trans }}
                 {% endif %}
             </aside>
             {% endfor %}
 
-
         </div>
     </article>
 {% endmacro macro_note %}