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

Merge branch 'issue406_truncate_comment' into 'master'

Browse Source 
Truncate comment

See merge request Chill-Projet/chill-bundles!304
This commit is contained in:
Julien Fastré 2022-01-26 13:06:04 +00:00
commit 12c68a4c9f
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -11,7 +11,9 @@ and this project adheres to
## Unreleased ## Unreleased
<!-- write down unreleased development here --> <!-- write down unreleased development here -->
* [parcours] comments truncated if too long + link added (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/406)
* [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382) * [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382)
* [person ressources]: module added
## Test releases ## Test releases

5
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
View File

@ -77,7 +77,10 @@
<h4 class="item-key visually-hidden">{{ 'Pinned comment'|trans }}</h4> <h4 class="item-key visually-hidden">{{ 'Pinned comment'|trans }}</h4>
<blockquote class="chill-user-quote"> <blockquote class="chill-user-quote">
<i class="fa fa-flag float-end text-chill-gray" title="{{ 'pinned'|trans }}"></i> <i class="fa fa-flag float-end text-chill-gray" title="{{ 'pinned'|trans }}"></i>
{{ accompanyingCourse.pinnedComment.content|chill_markdown_to_html }} {{ accompanyingCourse.pinnedComment.content|u.truncate(250, '…', false)|chill_markdown_to_html }}
{% if accompanyingCourse.pinnedComment.content|length > 250 %}
<a href="{{ chill_path_add_return_path('chill_person_accompanying_period_comment_list', {'accompanying_period_id': accompanyingCourse.id}) }}">{{ 'Read more'|trans }}</a>
{% endif %}
<div class="metadata"> <div class="metadata">
{{ 'Last updated by'| trans }} {{ 'Last updated by'| trans }}
<span class="user"> <span class="user">

1
src/Bundle/ChillPersonBundle/translations/messages.fr.yml
View File

@ -447,6 +447,7 @@ accompanying_course_comment:
Comment removed: Commentaire supprimé Comment removed: Commentaire supprimé
Remove comment: Supprimer le commentaire Remove comment: Supprimer le commentaire
Are you sure you want to remove comment ?: Étes-vous sûr de vouloir supprimer ce commentaire ? Are you sure you want to remove comment ?: Étes-vous sûr de vouloir supprimer ce commentaire ?
Read more: En savoir plus
# Household # Household
Household: Ménage Household: Ménage