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

fix error in user loading and validate scope/user consistency

Browse Source
This commit is contained in:
Julien Fastré
2018-08-29 23:18:37 +02:00
parent 7b7d30797f
commit 6e8f72f5cc
5 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/translations/messages.fr.yml
View File

@@ -12,6 +12,7 @@ list_reasons: liste des sujets
user_username: nom de l'utilisateur
circle_name: nom du cercle
Remark: Notes
No remarks: Aucune note
Add a new activity: Ajouter une nouvelle activité
Activity list: Liste des activités
present: présent

2
Resources/views/Activity/show.html.twig
View File

@@ -26,7 +26,7 @@
<dt class="inline">{{ 'Type'|trans }}</dt>
<dd>{{ entity.type.name | localize_translatable_string }}</dd>
<dt class="inline">{{ 'Remark'|trans }}</dt>
<dd>{% if entity.remark is empty %}{{ 'No remarks'|trans }}{% else %}<blockquote class="chill-user-quote">{{ entity.remark|nl2br }}</blockquote>{% endif %}</dd>
<dd>{% if entity.remark is empty %}<span class="chill-no-data-statement">{{ 'No remarks'|trans }}</span>{% else %}<blockquote class="chill-user-quote">{{ entity.remark|nl2br }}</blockquote>{% endif %}</dd>
<dt class="inline">{{ 'Attendee'|trans }}</dt>
<dd>{% if entity.attendee is not null %}{% if entity.attendee %}{{ 'present'|trans|capitalize }} {% else %} {{ 'not present'|trans|capitalize }}{% endif %}{% else %}{{ 'None'|trans|capitalize }}{% endif %}</dd>