diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js index 2a2fc28ce..9f26430e1 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js @@ -22,7 +22,7 @@ const addressMessages = { corridor: 'Couloir', steps: 'Escalier', flat: 'Appartement', - buildingName: 'Nom du bâtiment', + buildingName: 'Résidence', extra: 'Complément d\'adresse', distribution: 'Cedex', create_postal_code: 'Localité inconnue. Cliquez ici pour créer une nouvelle localité', diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue index 997774190..ec925a6b7 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue @@ -16,7 +16,7 @@

-
+
{{ $t('floor') }}: {{ address.floor }} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig index 4628e3cb5..b1bdb8438 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig @@ -34,25 +34,25 @@ {% macro extended(address, options) %} {% if address.floor is not empty %} - {{ address.floor }} + {{ 'address more.floor'|trans }} {{ address.floor }} {% endif %} {% if address.corridor is not empty %} - {{ address.corridor }} + {{ 'address more.corridor'|trans }} {{ address.corridor }} {% endif %} {% if address.steps is not empty %} - {{ address.steps }} + {{ 'address more.steps'|trans }} {{ address.steps }} {% endif %} {% if address.buildingName is not empty %} - {{ address.buildingName }} + {{ 'address more.buildingName'|trans }} {{ address.buildingName }} {% endif %} {% if address.flat is not empty %} - {{ address.flat }} - {% endif %} - {% if address.distribution is not empty %} - {{ address.distribution }} + {{ 'address more.flat'|trans }} {{ address.flat }} {% endif %} {% if address.extra is not empty %} - {{ address.extra }} + {{ 'address more.extra'|trans }} {{ address.extra }} + {% endif %} + {% if address.distribution is not empty %} + {{ 'address more.distribution'|trans }} {{ address.distribution }} {% endif %} {% endmacro %} diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml index b230b6ac1..9ffff5bcb 100644 --- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml @@ -74,6 +74,15 @@ address: address_homeless: L'adresse est-elle celle d'un domicile fixe ? real address: Adresse d'un domicile consider homeless: N'est pas l'adresse d'un domicile (SDF) +address more: + floor: ét + corridor: coul + steps: esc + flat: appart + buildingName: résidence + extra: '' + distribution: cedex +Create a new address: Créer une nouvelle adresse #serach Your search is empty. Please provide search terms.: La recherche est vide. Merci de fournir des termes de recherche. diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig index 91cef1d15..9feebaee8 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig @@ -23,7 +23,7 @@ {% if address is empty %}

{{ 'household.Household does not have any address currently'|trans }}

{% else %} - {{ address|chill_entity_render_box({'multiline': true}) }} + {{ address|chill_entity_render_box({'multiline': true, 'extended_infos': true }) }} {% endif %}