diff --git a/app/views/france_connect/particulier/merge.html.haml b/app/views/france_connect/particulier/merge.html.haml index cfc11c4af..0d7b98f3a 100644 --- a/app/views/france_connect/particulier/merge.html.haml +++ b/app/views/france_connect/particulier/merge.html.haml @@ -3,7 +3,7 @@ .container %h1.page-title= t('.title', application_name: Current.application_name) - %p= t('.subtitle', email: sanitize(@fci.email_france_connect), application_name: Current.application_name).html_safe + %p= t('.subtitle_html', email: @fci.email_france_connect, application_name: Current.application_name) .form.mt-2 %label= t('.label_select_merge_flow', email: @fci.email_france_connect) diff --git a/app/views/layouts/commencer/_no_procedure.html.haml b/app/views/layouts/commencer/_no_procedure.html.haml index ed5d4a59c..36fb66cae 100644 --- a/app/views/layouts/commencer/_no_procedure.html.haml +++ b/app/views/layouts/commencer/_no_procedure.html.haml @@ -6,5 +6,5 @@ %p= t('.line2') %p= t('.line3') %hr - %p.small-simple= t('.are_you_new', app_name: Current.application_name.gsub("-","‑")).html_safe + %p.small-simple= t('.are_you_new', app_name: Current.application_name) = link_to t('views.users.sessions.new.find_procedure'), t("links.common.faq.comment_trouver_ma_demarche_url"), title: new_tab_suffix(t('views.users.sessions.new.find_procedure')), class: "fr-btn fr-btn--secondary", **external_link_attributes diff --git a/config/locales/en.yml b/config/locales/en.yml index f389547b1..ff14990c4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -863,7 +863,7 @@ en: fill_in_password: fill in your password to merge your accounts merge: title: "Merge your account FranceConnect and %{application_name}" - subtitle: "Hello,

Your account FranceConnect uses %{email} as contact email.
But there is an existing %{application_name} account using this email." + subtitle_html: "Hello,

Your account FranceConnect uses %{email} as contact email.
But there is an existing %{application_name} account using this email." label_select_merge_flow: Is %{email} one of your email account ? title_fill_in_password: To merge your accounts fill in your password button_merge: Merge accounts diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 0e876e8e5..3956dae4b 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -916,7 +916,7 @@ fr: fill_in_password: entrez votre mot de passe pour fusionner les comptes merge: title: "Fusion des comptes FranceConnect et %{application_name}" - subtitle: "Bonjour,

Votre compte FranceConnect utilise %{email} comme email de contact.
Or il existe un compte sur %{application_name} avec cet email." + subtitle_html: "Bonjour,

Votre compte FranceConnect utilise %{email} comme email de contact.
Or il existe un compte sur %{application_name} avec cet email." label_select_merge_flow: Ce compte %{email} vous appartient-il ? title_fill_in_password: Pour les fusionner, entrez votre mot de passe button_merge: Fusionner les comptes