diff --git a/app/views/shared/dossiers/_update_contact_information.html.haml b/app/views/shared/dossiers/_update_contact_information.html.haml index b60d86032..a4abc0620 100644 --- a/app/views/shared/dossiers/_update_contact_information.html.haml +++ b/app/views/shared/dossiers/_update_contact_information.html.haml @@ -2,7 +2,7 @@ - service = dossier&.service || procedure.service - if service.present? %h3.fr-footer__top-cat= I18n.t('users.procedure_footer.managed_by.header') - .fr-footer__top-link.fr-pb-2w + .fr-footer__top-link.fr-pb-3w %span{ lang: :fr }= service.pretty_nom %div{ lang: :fr } = render SimpleFormatComponent.new(service.adresse, class_names_map: {paragraph: 'fr-footer__content-desc'}) @@ -17,14 +17,12 @@ = I18n.t('users.procedure_footer.contact.email.link') = link_to service.email, "mailto:#{service.email}", class: "fr-footer__link" - - if service.present? - - if service.telephone.present? || service.horaires.present? + - if service.telephone.present? %li - - horaires = "#{I18n.t('users.procedure_footer.contact.schedule.prefix')}#{formatted_horaires(service.horaires)}" - - if service.telephone.present? - = link_to service.telephone_url, class: 'fr-footer__top-link' do - %p - = I18n.t('users.procedure_footer.contact.phone.link', service_telephone: service.telephone) - - if service.horaires.present? - %p - = horaires + %span.fr-footer__top-link + = I18n.t('users.procedure_footer.contact.phone.label') + = link_to I18n.t('users.procedure_footer.contact.phone.link', service_telephone: service.telephone), service.telephone_url, class: 'fr-footer__link' + + - if service.horaires.present? + %li + = "#{I18n.t('users.procedure_footer.contact.schedule.prefix')}#{formatted_horaires(service.horaires)}" diff --git a/config/locales/views/users/procedure_footer/en.yml b/config/locales/views/users/procedure_footer/en.yml index 3dade9a89..102b8a5f0 100644 --- a/config/locales/views/users/procedure_footer/en.yml +++ b/config/locales/views/users/procedure_footer/en.yml @@ -4,23 +4,23 @@ en: managed_by: header: 'This procedure is managed by' contact: - header: 'Ask a question about the procedure :' + header: 'Ask a question about the procedure' in_app_mail: link: "Direclty via the chat" email: - link: "Directly by email:" + link: "Directly by email: " phone: - link: 'By phone: %{service_telephone}' + label: 'By phone: ' schedule: - prefix: 'Hours : ' + prefix: 'Hours: ' stats: link: "See the procedure's stats" legals: header: "Legals" - data_retention: "Data retention and archiving : %{duree_conservation_dossiers_dans_ds} months" + data_retention: "Data retention and archiving: %{duree_conservation_dossiers_dans_ds} months" terms: "Laws regarding this data collection" dpo: "Contact the Data Protection Officer" - dematerialisation: + dematerialisation: header: Paperless title_1: Download the PDF form link: "https://www.transformation.gouv.fr/france-services" diff --git a/config/locales/views/users/procedure_footer/fr.yml b/config/locales/views/users/procedure_footer/fr.yml index 7e986ed53..557905380 100644 --- a/config/locales/views/users/procedure_footer/fr.yml +++ b/config/locales/views/users/procedure_footer/fr.yml @@ -8,9 +8,10 @@ fr: in_app_mail: link: "Directement par la messagerie" email: - link: "Directement par courriel :" + link: "Directement par courriel :" phone: - link: 'Par téléphone au %{service_telephone}' + label: 'Par téléphone au : ' + link: '%{service_telephone}' schedule: prefix: "Horaires d’ouverture : " stats: