diff --git a/app/views/commencer/show.html.haml b/app/views/commencer/show.html.haml
index d60425187..4eb4840a5 100644
--- a/app/views/commencer/show.html.haml
+++ b/app/views/commencer/show.html.haml
@@ -2,13 +2,13 @@
.commencer.form
- if !user_signed_in?
- %h2.huge-title Commencer la démarche
+ %h2.huge-title= t('views.commencer.show.start_procedure')
= render partial: 'shared/france_connect_login', locals: { url: commencer_france_connect_path(path: @procedure.path) }
= link_to commencer_sign_up_path(path: @procedure.path), class: ['button large expand primary'] do
- Créer un compte
+ = t('views.shared.account.create')
%span.optional-on-small-screens
#{APPLICATION_NAME}
- = link_to 'J’ai déjà un compte', commencer_sign_in_path(path: @procedure.path), class: ['button large expand']
+ = link_to t('views.shared.account.already_user'), commencer_sign_in_path(path: @procedure.path), class: ['button large expand']
- else
- dossiers = current_user.dossiers.where(revision: @revision.draft? ? @revision : @procedure.revisions.where.not(id: @procedure.draft_revision_id))
@@ -20,33 +20,29 @@
- elsif drafts.count == 1 && not_drafts.count == 0
- dossier = drafts.first
- %h2.huge-title Vous avez déjà commencé à remplir un dossier
+ %h2.huge-title= t('views.commencer.show.already_draft')
%p
- Il y a #{time_ago_in_words(dossier.created_at)},
- vous avez commencé à remplir un dossier sur la démarche « #{dossier.procedure.libelle} ».
- = link_to 'Continuer à remplir mon dossier', brouillon_dossier_path(dossier), class: ['button large expand primary']
- = link_to 'Commencer un nouveau dossier', url_for_new_dossier(@revision), class: ['button large expand']
+ = t('views.commencer.show.already_draft_detail_html', time_ago: time_ago_in_words(dossier.created_at), procedure: dossier.procedure.libelle)
+ = link_to t('views.commencer.show.continue_file'), brouillon_dossier_path(dossier), class: ['button large expand primary']
+ = link_to t('views.commencer.show.start_new_file'), url_for_new_dossier(@revision), class: ['button large expand']
- elsif not_drafts.count == 1
- dossier = not_drafts.first
- %h2.huge-title Vous avez déjà déposé un dossier
+ %h2.huge-title= t('views.commencer.show.already_not_draft')
%p
- Il y a #{time_ago_in_words(dossier.en_construction_at)},
- vous avez déposé un dossier sur la démarche « #{dossier.procedure.libelle} ».
- = link_to 'Voir mon dossier déposé', dossier_path(dossier), class: ['button large expand primary']
- = link_to 'Commencer un nouveau dossier', url_for_new_dossier(@revision), class: ['button large expand']
+ = t('views.commencer.show.already_not_draft_detail_html', time_ago: time_ago_in_words(dossier.en_construction_at), procedure: dossier.procedure.libelle)
+ = link_to t('views.commencer.show.show_my_submitted_file'), dossier_path(dossier), class: ['button large expand primary']
+ = link_to t('views.commencer.show.start_new_file'), url_for_new_dossier(@revision), class: ['button large expand']
- else
%h2.huge-title= t('views.commencer.show.existing_dossiers')
= link_to t('views.commencer.show.show_dossiers'), dossiers_path, class: ['button large expand primary']
- = link_to t('views.commencer.show.start_new_dossier'), url_for_new_dossier(@revision), class: ['button large expand']
+ = link_to t('views.commencer.show.start_new_file'), url_for_new_dossier(@revision), class: ['button large expand']
- if @procedure.feature_enabled?(:dossier_pdf_vide)
- pdf_link = @revision.draft? ? commencer_dossier_vide_test_path(path: @procedure.path) : commencer_dossier_vide_path(path: @procedure.path)
%hr
- %p
- Vous souhaitez effectuer une demande par papier ? Vous pouvez télécharger un dossier vide au format PDF,
- et l'envoyer à l’administration concernée :
- #{@procedure&.service&.nom} - #{@procedure&.service&.adresse}
+ %p= t('views.commencer.show.want_empty_pdf', service: @procedure&.service&.nom, adresse: @procedure&.service&.adresse)
+
%br
- = link_to 'Télécharger un dossier vide au format PDF', pdf_link, class: ['button large expand']
+ = link_to t('views.commencer.show.download_empty_pdf'), pdf_link, class: ['button large expand']
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a82cedc27..f64875688 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -51,6 +51,15 @@ en:
existing_dossiers: You already have files for this procedure
show_dossiers: View my current files
start_new_dossier: Start a new file
+ already_draft: "You already started to fill a file"
+ already_draft_detail_html: "You started to fill a file for the \"%{procedure}\" procedure %{time_ago} ago"
+ already_not_draft: "You already submitted a file"
+ already_not_draft_detail_html: "You submitted a file for the \"%{procedure}\" procedure %{time_ago} ago."
+ continue_file: "Continue to fill my file"
+ start_new_file: "Start a new file"
+ show_my_submitted_file: 'Show my submitted file'
+ want_empty_pdf: "You prefer to submit a paper form ? You can download an empty PDF file, and send it to the right administration : %{service} - %{adresse}"
+ download_empty_pdf: 'Download an empty PDF file'
invites:
dropdown:
invite_to_edit: Invite someone to edit this file
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index a4caf428b..e96f03d17 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -40,7 +40,16 @@ fr:
start_procedure: Commencer la démarche
existing_dossiers: Vous avez déjà des dossiers pour cette démarche
show_dossiers: Voir mes dossiers en cours
- start_new_dossier: Commencer un nouveau dossier
+ already_draft: "Vous avez déjà commencé à remplir un dossier"
+ already_draft_detail_html: "Il y a %{time_ago}, vous avez commencé à remplir un dossier sur la démarche « %{procedure} »."
+ already_not_draft: "Vous avez déjà déposé un dossier"
+ already_not_draft_detail_html: "Il y a %{time_ago}, vous avez déposé un dossier sur la démarche « %{procedure} »."
+ continue_file: 'Continuer à remplir mon dossier'
+ start_new_file: 'Commencer un nouveau dossier'
+ show_my_submitted_file: 'Voir mon dossier déposé'
+ want_empty_pdf: "Vous souhaitez effectuer une demande par papier ? Vous pouvez télécharger un dossier vide au format PDF, et l'envoyer à l’administration concernée : %{service} - %{adresse}"
+ download_empty_pdf: 'Télécharger un dossier vide au format PDF'
+
invites:
dropdown:
invite_to_edit: Inviter une personne à modifier ce dossier
diff --git a/config/locales/views/shared/en.yml b/config/locales/views/shared/en.yml
index b4c087c37..53b068bf0 100644
--- a/config/locales/views/shared/en.yml
+++ b/config/locales/views/shared/en.yml
@@ -6,4 +6,7 @@ en:
description: "France connect is a solution proposed by the government to secure and simplify the connection to web services."
login_button: "Sign in with FranceConnect"
help_link: What is FranceConnect ?
- separator: or
\ No newline at end of file
+ separator: or
+ account:
+ already_user: "I already have an account"
+ create: 'Create an account'
diff --git a/config/locales/views/shared/fr.yml b/config/locales/views/shared/fr.yml
index 134ea566b..b56cb8783 100644
--- a/config/locales/views/shared/fr.yml
+++ b/config/locales/views/shared/fr.yml
@@ -15,3 +15,6 @@ fr:
login_button: "S’identifier avec FranceConnect"
help_link: "Qu’est-ce que FranceConnect ?"
separator: 'ou'
+ account:
+ already_user: 'J’ai déjà un compte'
+ create: 'Créer un compte'