diff --git a/Entity/AccompanyingPeriod.php b/Entity/AccompanyingPeriod.php index eefcac905..396b92872 100644 --- a/Entity/AccompanyingPeriod.php +++ b/Entity/AccompanyingPeriod.php @@ -200,7 +200,7 @@ class AccompanyingPeriod if (! $this->isClosingAfterOpening()) { $context->addViolationAt('dateClosing', - 'validation.AccompanyingPeriod.constraint.dateOfClosing_before_dateOfOpening', + 'The date of closing is before the date of opening', array(), null); } } diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml index 6ae7b3f25..f5022bd77 100644 --- a/Resources/translations/messages.fr.yml +++ b/Resources/translations/messages.fr.yml @@ -62,7 +62,7 @@ Reset: 'Remise à zéro' 'Person accompanying period - %name%': 'Historique du dossier - %name%' 'Opening date': 'Date d''ouverture' 'Closing date': 'Date de fermeture' -'Still open': 'Toujours en cours' +'Period opened': 'Période ouverte' 'Close accompanying period': 'Clôre le dossier' 'Open accompanying period': 'Ouvrir le dossier' 'Create accompanying period': 'Nouvelle ouverture-fermeture à une autre date' @@ -78,3 +78,7 @@ Accompanying period list: Périodes d'accompagnement CHILL_PERSON_SEE: Voir les personnes CHILL_PERSON_UPDATE: Modifier les personnes CHILL_PERSON_CREATE: Ajouter des personnes + +#period +Period closed!: Période clôturée! +Pediod closing form is not valide: Le formulaire de fermeture n'est pas valide diff --git a/Resources/translations/validators.fr.yml b/Resources/translations/validators.fr.yml index d82d8d712..b29c5306d 100644 --- a/Resources/translations/validators.fr.yml +++ b/Resources/translations/validators.fr.yml @@ -10,3 +10,4 @@ 'Opening date can not be null': 'La date d''ouverure ne peut être nulle' 'Closing date is not valid': 'La date de fermeture n''est pas valide' 'Closing date can not be null': 'La date de fermeture ne peut être nulle' +The date of closing is before the date of opening: La période de fermeture est après la période d'ouverture diff --git a/Resources/views/AccompanyingPeriod/form.html.twig b/Resources/views/AccompanyingPeriod/form.html.twig index 98c538323..aa5c63651 100644 --- a/Resources/views/AccompanyingPeriod/form.html.twig +++ b/Resources/views/AccompanyingPeriod/form.html.twig @@ -24,8 +24,9 @@ {{ form_rest(form) }} -
- +
+ + {{ 'Back to the list'|trans }}
{{ form_end(form) }} diff --git a/Resources/views/AccompanyingPeriod/list.html.twig b/Resources/views/AccompanyingPeriod/list.html.twig index ff4ec863b..9c625d731 100644 --- a/Resources/views/AccompanyingPeriod/list.html.twig +++ b/Resources/views/AccompanyingPeriod/list.html.twig @@ -21,7 +21,7 @@ {{ accompanying_period.openingDate|localizeddate('long', 'none', app.request.locale) }} {% spaceless %} {% if accompanying_period.isOpen %} - {{ 'Still open'|trans }} + {{ 'Period opened'|trans }} {% else %} {{ accompanying_period.closingDate|localizeddate('long', 'none', app.request.locale) }} {% endif %} @@ -31,7 +31,7 @@
- {{ 'Edit'|trans }} + {{ 'Edit'|trans }}
@@ -40,32 +40,21 @@
- - -
-
- {% spaceless %} - {% if person.isOpen == true %} - - {{'Close accompanying period'|trans }} - - {% else %} - - {{'Open accompanying period'|trans }} - - {% endif %} - {% endspaceless %} -
-
+ + {% if person.isOpen == true %} + + {{'Close accompanying period'|trans }} + + {% else %} + + {{'Open accompanying period'|trans }} + + {% endif %} +

{% endblock personcontent %} \ No newline at end of file