From 3bdf6b63d9fde963abf2e478fb9436a3649f1cf9 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Wed, 1 Dec 2021 11:02:16 +0100 Subject: [PATCH] small wording fixes --- app/controllers/instructeurs/dossiers_controller.rb | 2 +- app/controllers/users/dossiers_controller.rb | 4 ++-- config/locales/en.yml | 2 +- config/locales/fr.yml | 2 +- spec/system/users/list_dossiers_spec.rb | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/instructeurs/dossiers_controller.rb b/app/controllers/instructeurs/dossiers_controller.rb index 1d56d8acc..be14a79b3 100644 --- a/app/controllers/instructeurs/dossiers_controller.rb +++ b/app/controllers/instructeurs/dossiers_controller.rb @@ -235,7 +235,7 @@ module Instructeurs flash.notice = 'Le dossier a bien été supprimé' redirect_to instructeur_procedure_path(procedure) else - flash.alert = "Suppression impossible : le dossier n’est pas terminé" + flash.alert = "Suppression impossible : le dossier n’est pas traité" redirect_back(fallback_location: instructeur_procedures_url) end end diff --git a/app/controllers/users/dossiers_controller.rb b/app/controllers/users/dossiers_controller.rb index 87673cfa2..4fa81c42f 100644 --- a/app/controllers/users/dossiers_controller.rb +++ b/app/controllers/users/dossiers_controller.rb @@ -217,7 +217,7 @@ module Users if dossier.can_be_deleted_by_user? dossier.discard_and_keep_track!(current_user, :user_request) - flash.notice = t('.deleted_dossier') + flash.notice = t('.soft_deleted_dossier') redirect_to dossiers_path else flash.notice = t('.undergoingreview') @@ -291,7 +291,7 @@ module Users def hide_dossier dossier = current_user.dossiers.includes(:user, procedure: :administrateurs).find(params[:id]) dossier.update(hidden_by_user_at: Time.zone.now) - flash.notice = t('users.dossiers.ask_deletion.deleted_dossier') + flash.notice = t('users.dossiers.ask_deletion.soft_deleted_dossier') redirect_to dossiers_path end diff --git a/config/locales/en.yml b/config/locales/en.yml index ef50c513d..377da67ea 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -389,7 +389,7 @@ en: message_send: "Your message has been sent to the instructor in charge of your file." ask_deletion: undergoingreview: "Your file is undergoing review. It is no longer possible to delete your file. To cancel the undergoingreview contact the adminitration via the mailbox." - deleted_dossier: "Your file has been successfully deleted" + soft_deleted_dossier: "Your file has been successfully deleted from your interface" update_brouillon: draft_saved: "Your draft has been saved." etablissement: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 2a4a1739b..929657d66 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -402,7 +402,7 @@ fr: message_send: "Votre message a bien été envoyé à l’instructeur en charge de votre dossier." ask_deletion: undergoingreview: "L’instruction de votre dossier a commencé, il n’est plus possible de supprimer votre dossier. Si vous souhaitez annuler l’instruction contactez votre administration par la messagerie de votre dossier." - deleted_dossier: "Votre dossier a bien été supprimé." + soft_deleted_dossier: "Votre dossier a bien été supprimé de votre interface" update_brouillon: draft_saved: "Votre brouillon a bien été sauvegardé." etablissement: diff --git a/spec/system/users/list_dossiers_spec.rb b/spec/system/users/list_dossiers_spec.rb index 42733b337..3c6b71517 100644 --- a/spec/system/users/list_dossiers_spec.rb +++ b/spec/system/users/list_dossiers_spec.rb @@ -76,7 +76,7 @@ describe 'user access to the list of their dossiers' do end end - expect(page).to have_content('Votre dossier a bien été supprimé.') + expect(page).to have_content('Votre dossier a bien été supprimé') expect(page).not_to have_content(dossier_brouillon.procedure.libelle) end end