DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

fix brakeman

Browse source
This commit is contained in:
simon lehericey 2024-03-21 09:41:52 +01:00
parent 1dfd3bf573
commit 44b113e433
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/france_connect/particulier/merge.html.haml
View file

@ -3,7 +3,7 @@
.container .container
%h1.page-title= t('.title', application_name: Current.application_name) %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 .form.mt-2
%label= t('.label_select_merge_flow', email: @fci.email_france_connect) %label= t('.label_select_merge_flow', email: @fci.email_france_connect)

2
app/views/layouts/commencer/_no_procedure.html.haml
View file

@ -6,5 +6,5 @@
%p= t('.line2') %p= t('.line2')
%p= t('.line3') %p= t('.line3')
%hr %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 = 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

2
config/locales/en.yml
View file

@ -863,7 +863,7 @@ en:
fill_in_password: fill in your password to merge your accounts fill_in_password: fill in your password to merge your accounts
merge: merge:
title: "Merge your account FranceConnect and %{application_name}" title: "Merge your account FranceConnect and %{application_name}"
subtitle: "Hello,<br /><br />Your account FranceConnect uses <b class='bold'>%{email}</b> as contact email.<br />But there is an existing %{application_name} account using this email." subtitle_html: "Hello,<br /><br />Your account FranceConnect uses <b class='bold'>%{email}</b> as contact email.<br />But there is an existing %{application_name} account using this email."
label_select_merge_flow: Is %{email} one of your email account ? label_select_merge_flow: Is %{email} one of your email account ?
title_fill_in_password: To merge your accounts fill in your password title_fill_in_password: To merge your accounts fill in your password
button_merge: Merge accounts button_merge: Merge accounts

2
config/locales/fr.yml
View file

@ -916,7 +916,7 @@ fr:
fill_in_password: entrez votre mot de passe pour fusionner les comptes fill_in_password: entrez votre mot de passe pour fusionner les comptes
merge: merge:
title: "Fusion des comptes FranceConnect et %{application_name}" title: "Fusion des comptes FranceConnect et %{application_name}"
subtitle: "Bonjour,<br /><br />Votre compte FranceConnect utilise <b class='bold'>%{email}</b> comme email de contact.<br />Or il existe un compte sur %{application_name} avec cet email." subtitle_html: "Bonjour,<br /><br />Votre compte FranceConnect utilise <b class='bold'>%{email}</b> comme email de contact.<br />Or il existe un compte sur %{application_name} avec cet email."
label_select_merge_flow: Ce compte %{email} vous appartient-il ? label_select_merge_flow: Ce compte %{email} vous appartient-il ?
title_fill_in_password: Pour les fusionner, entrez votre mot de passe title_fill_in_password: Pour les fusionner, entrez votre mot de passe
button_merge: Fusionner les comptes button_merge: Fusionner les comptes