Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-28 01:25:00 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'master' into issue394_address_confidential

Browse Source
This commit is contained in:
Julien Fastré
2022-01-27 15:39:10 +01:00
parent 25ee11e4ff 6df570d96c
commit 7c8b08c3a7
222 changed files with 9243 additions and 1925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Bundle/ChillMainBundle/Resources/views/Entity/CommentEmbeddable.html.twig
View File

@@ -23,23 +23,23 @@
{% if options['metadata'] %}
<div class="metadata">
{% if user is not empty %}
{{ 'Last updated by'| trans }}
<span class="user">
{{ user|chill_entity_render_box(options['user']) }}
</span>
{% endif %}
{% if comment.date is not empty %}
{% if user is empty %}
{{ 'Last updated on'|trans ~ ' ' }}
{% else %}
{{ 'on'|trans ~ ' ' }}
{% endif %}
{{ 'Last updated on'|trans ~ ' ' }}
<span class="date">
{{ comment.date|format_datetime("medium", "short") }}
</span>
{% endif %}
{% if user is not empty %}
{% if comment.date is empty %}
{{ 'Last updated by'| trans }}
{% else %}
{{ 'by_user'|trans ~ ' ' }}
{% endif %}
<span class="user">
{{ user|chill_entity_render_box(options['user']) }}
</span>
{% endif %}
</div>
{% endif %}
</blockquote>
{{ closing_box|raw }}
{{ closing_box|raw }}