From 0065d8933e3e9ce7a8a2d180267a1fd9455b04b8 Mon Sep 17 00:00:00 2001 From: Corinne Durrmeyer Date: Fri, 28 Jun 2024 11:09:46 +0200 Subject: [PATCH 1/3] Combine address in a single paragraph --- app/views/static_pages/legal_notice.html.haml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/views/static_pages/legal_notice.html.haml b/app/views/static_pages/legal_notice.html.haml index ffa99bd18..c39d3637f 100644 --- a/app/views/static_pages/legal_notice.html.haml +++ b/app/views/static_pages/legal_notice.html.haml @@ -13,9 +13,12 @@ .fr-mb-4w %h2 = t('views.legal_notice.editing') - %p.fr-mb-2w= t('views.legal_notice.editing_content.line_one') - %p.fr-mb-2w= t('views.legal_notice.editing_content.line_two') - %p.fr-mb-2w= t('views.legal_notice.editing_content.line_three') + %p + = t('views.legal_notice.editing_content.line_one') + %br + = t('views.legal_notice.editing_content.line_two') + %br + = t('views.legal_notice.editing_content.line_three') .fr-mb-4w %h2 From 43c8ea7beece52bcdd27ff74f3ceaa3a6bff7c18 Mon Sep 17 00:00:00 2001 From: Corinne Durrmeyer Date: Fri, 28 Jun 2024 11:11:26 +0200 Subject: [PATCH 2/3] Replace a series of

with a

--- app/views/static_pages/legal_notice.html.haml | 20 ++++++++++++++----- config/locales/en.yml | 11 ++++++++-- config/locales/fr.yml | 14 ++++++++----- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/app/views/static_pages/legal_notice.html.haml b/app/views/static_pages/legal_notice.html.haml index c39d3637f..889d0f86f 100644 --- a/app/views/static_pages/legal_notice.html.haml +++ b/app/views/static_pages/legal_notice.html.haml @@ -28,8 +28,18 @@ .fr-mb-4w %h2 = t('views.legal_notice.hosting') - %p.fr-mb-2w= t('views.legal_notice.hosting_content.line_one') - %p.fr-mb-2w= t('views.legal_notice.hosting_content.line_two') - %p.fr-mb-2w= t('views.legal_notice.hosting_content.line_three') - %p.fr-mb-2w= t('views.legal_notice.hosting_content.line_four') - %p.fr-mb-2w= t('views.legal_notice.hosting_content.line_five') + %h3 + = t('views.legal_notice.hosting_content.firm') + %dl.pl-0 + .flex + %dt= t('views.legal_notice.hosting_content.RCS_term') + %dd= t('views.legal_notice.hosting_content.RCS_value') + .flex + %dt= t('views.legal_notice.hosting_content.APE_term') + %dd= t('views.legal_notice.hosting_content.APE_value') + .flex + %dt= t('views.legal_notice.hosting_content.TVA_term_html') + %dd= t('views.legal_notice.hosting_content.TVA_value') + .flex + %dt= t('views.legal_notice.hosting_content.headquarters_term') + %dd= t('views.legal_notice.hosting_content.headquarters_value') diff --git a/config/locales/en.yml b/config/locales/en.yml index 23860d6be..ccaf6e742 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -111,8 +111,15 @@ en: direction_content: "Ms. Stéphanie Schaer , Interministerial Director of Digital Affairs." hosting: "Hosting provider" hosting_content: - line_four: "VAT NUMBER: FR 22 424 761 419" - line_five: "Head office : 2 rue Kellermann - 59100 Roubaix - France." + firm: "OVH" + RCS_term: "Commercial register" + RCS_value: "Roubaix – Tourcoing 424 761 419 00045" + APE_term: "APE (business activity) code" + APE_value: "6202A" + TVA_term_html: "VAT NUMBER" + TVA_value: "FR 22 424 761 419" + headquarters_term: "Head office" + headquarters_value: "2 rue Kellermann - 59100 Roubaix - France" accessibility_statement: title: "Accessibility statement" line_one_html: "DINUM is committed to making its service accessible in accordance with Article 47 of Law No. 2005-102 of 11 February 2005." diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 4559e8795..be81a3a18 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -104,11 +104,15 @@ fr: direction_content: "Madame Stéphanie Schaer , Directrice interministérielle du numérique." hosting: "Prestataire d'hébergement" hosting_content: - line_one: "OVH" - line_two: "RCS Roubaix – Tourcoing 424 761 419 00045" - line_three: "Code APE 6202A" - line_four: "N° TVA : FR 22 424 761 419" - line_five: "Siège social : 2 rue Kellermann - 59100 Roubaix - France." + firm: "OVH" + RCS_term: "RCS" + RCS_value: "Roubaix – Tourcoing 424 761 419 00045" + APE_term: "Code APE" + APE_value: "6202A" + TVA_term_html: "N° TVA" + TVA_value: "FR 22 424 761 419" + headquarters_term: "Siège social" + headquarters_value: "2 rue Kellermann - 59100 Roubaix - France" accessibility_statement: title: "Déclaration d’accessibilité" line_one_html: "La DINUM s’engage à rendre son service accessible, conformément à l’article 47 de la loi n° 2005-102 du 11 février 2005." From ee44a61ef230842f04799f68527d8e001aaa62ed Mon Sep 17 00:00:00 2001 From: Corinne Durrmeyer Date: Fri, 28 Jun 2024 11:11:42 +0200 Subject: [PATCH 3/3] Fix typo --- config/locales/en.yml | 2 +- config/locales/fr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index ccaf6e742..c47931863 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -108,7 +108,7 @@ en: editing_content: line_one: "Interministerial Directorate for Digital Affairs (DINUM)" direction: "Publishing Department" - direction_content: "Ms. Stéphanie Schaer , Interministerial Director of Digital Affairs." + direction_content: "Ms. Stéphanie Schaer, Interministerial Director of Digital Affairs." hosting: "Hosting provider" hosting_content: firm: "OVH" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index be81a3a18..49d5015fc 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -101,7 +101,7 @@ fr: line_two: "20 Avenue de Ségur" line_three: "75007 PARIS" direction: "Direction de la publication" - direction_content: "Madame Stéphanie Schaer , Directrice interministérielle du numérique." + direction_content: "Madame Stéphanie Schaer, Directrice interministérielle du numérique." hosting: "Prestataire d'hébergement" hosting_content: firm: "OVH"