refactor(i18n): move signature translation keys to shared

app/views/devise_mailer/confirmation_instructions.en.html.haml

@@ -2,7 +2,7 @@
 - if @user.unconfirmed_email.nil?
   - content_for(:title, 'Activate account')
 
-  %p= t(:greeting, scope: [:layouts, :signature])
+  %p= t(:hello, scope: [:views, :shared, :greetings])
 
   %p
     You have entered your details to create an account on #{APPLICATION_NAME}. To confirm your email and finish creating your account, select the following link:
@@ -12,7 +12,7 @@
 - else
   - content_for(:title, "Change email address")
 
-  %p= t(:greeting, scope: [:layouts, :signature])
+  %p= t(:hello, scope: [:views, :shared, :greetings])
 
   %p
     To confirm your account email change on #{APPLICATION_NAME}, select the following link:

app/views/devise_mailer/confirmation_instructions.html.haml

@@ -2,7 +2,7 @@
 - if @user.unconfirmed_email.nil?
   - content_for(:title, 'Activez votre compte')
 
-  %p= t(:greeting, scope: [:layouts, :signature])
+  %p= t(:hello, scope: [:views, :shared, :greetings])
 
   %p
     Pour activer votre compte sur #{APPLICATION_NAME}, veuillez cliquer sur le lien suivant :
@@ -12,7 +12,7 @@
 - else
   - content_for(:title, "Changement d’adresse email")
 
-  %p= t(:greeting, scope: [:layouts, :signature])
+  %p= t(:hello, scope: [:views, :shared, :greetings])
 
   %p
     Pour confirmer votre changement d’adresse email, veuillez cliquer sur le lien suivant :

app/views/devise_mailer/email_changed.en.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, 'New email address')
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 - unconfirmed_email = @resource.try(:unconfirmed_email?)
 - if unconfirmed_email.present?

app/views/devise_mailer/email_changed.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, 'Votre nouvelle adresse email')
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 - unconfirmed_email = @resource.try(:unconfirmed_email?)
 - if unconfirmed_email.present?

app/views/devise_mailer/password_change.en.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, 'New password')
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   A request to change your password on #{APPLICATION_NAME} for the account #{@resource.email} was successfully processed.

app/views/devise_mailer/password_change.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, 'Votre nouveau mot de passe')
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   La demande de changement de mot de passe pour votre compte #{@resource.email} sur

app/views/devise_mailer/reset_password_instructions.en.html.haml

@@ -1,4 +1,4 @@
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   Someone has requested to change your account password on #{APPLICATION_NAME}. To define a new password, select the following link:

app/views/devise_mailer/reset_password_instructions.html.haml

@@ -1,4 +1,4 @@
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   Vous avez demandé à changer votre mot de passe sur #{APPLICATION_NAME}. Pour ceci, merci de cliquer sur le lien suivant :

app/views/devise_mailer/unlock_instructions.en.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, 'Reactivate account')
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   Someone made too many unsuccessful attempts to connect to your account #{@resource.email} on #{APPLICATION_NAME}.

app/views/devise_mailer/unlock_instructions.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, 'Réactivez votre compte')
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   Quelqu’un a tenté de se connecter un grand nombre de fois sans succès à votre

app/views/dossier_mailer/notify_automatic_deletion_to_administration.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, "#{@subject}")
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   = t('.header', count: @deleted_dossiers.count)

app/views/dossier_mailer/notify_automatic_deletion_to_user.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, "#{@subject}")
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   = t('.header', count: @deleted_dossiers.count)

app/views/dossier_mailer/notify_brouillon_deletion.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, "#{@subject}")
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   = t('.header', count: @dossier_hashes.count)

app/views/dossier_mailer/notify_brouillon_near_deletion.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, "#{@subject}")
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   = t('.header', count: @dossiers.count)

app/views/dossier_mailer/notify_brouillon_not_submitted.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, "#{@subject}")
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   Le dossier n°#{@dossier.id} pour la démarche  « 

app/views/dossier_mailer/notify_deletion_to_administration.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, "#{@subject}")
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   = t('.body', dossier_id: @deleted_dossier.dossier_id, procedure: @deleted_dossier.procedure.libelle)

app/views/dossier_mailer/notify_deletion_to_user.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, "#{@subject}")
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   = t('.body', dossier_id: @deleted_dossier.dossier_id, procedure: @deleted_dossier.procedure.libelle)

app/views/dossier_mailer/notify_groupe_instructeur_changed.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, "#{@subject}")
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   = "Vous suiviez jusqu'à maintenant le dossier n°#{@dossier_id} de la démarche #{@demarche}."

app/views/dossier_mailer/notify_instructeur_deletion_to_user.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, "#{@subject}")
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   = t('.body_html', dossier_id: @deleted_dossier.dossier_id, libelle_demarche: @deleted_dossier.procedure.libelle, deleted_dossiers_link: dossiers_url(statut: 'dossiers-supprimes'))

app/views/dossier_mailer/notify_near_deletion_to_administration.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, "#{@subject}")
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   - if @state == Dossier.states.fetch(:en_construction)

app/views/dossier_mailer/notify_near_deletion_to_user.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, "#{@subject}")
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   - if @state == Dossier.states.fetch(:en_construction)

app/views/dossier_mailer/notify_new_answer.en.html.haml

@@ -1,7 +1,7 @@
 - content_for :procedure_logo do
   = render 'layouts/mailers/logo', url: @logo_url
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 - if !@dossier.brouillon?
   %p

app/views/dossier_mailer/notify_new_answer.html.haml

@@ -1,7 +1,7 @@
 - content_for :procedure_logo do
   = render 'layouts/mailers/logo', url: @logo_url
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 - if !@dossier.brouillon?
   %p

app/views/dossier_mailer/notify_new_commentaire_to_instructeur.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, "#{@subject}")
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   = t('.body', dossier_id: @dossier.id, libelle_demarche: @dossier.procedure.libelle)

app/views/dossier_mailer/notify_new_dossier_depose_to_instructeur.html.haml

@@ -1,6 +1,6 @@
 - content_for(:title, "#{@subject}")
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   = t('.body', dossier_id: @dossier.id, libelle_demarche: @dossier.procedure.libelle)

app/views/dossier_mailer/notify_new_draft.en.html.haml

@@ -1,7 +1,7 @@
 - content_for :procedure_logo do
   = render 'layouts/mailers/logo', url: @logo_url
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   You started filling a File on the procedure:

app/views/dossier_mailer/notify_new_draft.html.haml

@@ -1,7 +1,7 @@
 - content_for :procedure_logo do
   = render 'layouts/mailers/logo', url: @logo_url
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   Vous avez commencé à remplir un dossier pour la démarche

app/views/dossier_mailer/notify_revert_to_instruction.en.html.haml

@@ -1,7 +1,7 @@
 - content_for :procedure_logo do
   = render 'layouts/mailers/logo', url: @logo_url
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   Your File will be reexamined. All previous decisions are void.

app/views/dossier_mailer/notify_revert_to_instruction.html.haml

@@ -1,7 +1,7 @@
 - content_for :procedure_logo do
   = render 'layouts/mailers/logo', url: @logo_url
 
-%p= t(:greeting, scope: [:layouts, :signature])
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   Votre dossier va être réexaminé, la précédente décision sur ce dossier est caduque.

app/views/layouts/mailers/_signature.html.haml

@@ -1,5 +1,5 @@
 %p
-  = t(:best_regards, scope: [:layouts, :signature])
+  = t(:best_regards, scope: [:views, :shared, :greetings])
   %br
   - if defined?(service) && service && service.nom.present?
     = service.nom

config/locales/en.yml

@@ -53,9 +53,6 @@ en:
         line3: administrative forms.
     locale_dropdown:
       languages: "Languages"
-    signature:
-      greeting: Dear Sir or Madam,
-      best_regards: Best Regards,
     notifications:
       actions:
         access: View your File
@@ -108,6 +105,9 @@ en:
       first: First
       truncate: '…'
     shared:
+      greetings:
+        hello: Dear Sir or Madam,
+        best_regards: Best Regards,
       dossiers:
         edit:
           autosave: Your file is automatically saved after each modification. You can close the window at any time and pick up where you left off later.

config/locales/fr.yml

@@ -43,9 +43,6 @@ fr:
         line3: administratifs dématérialisés.
     locale_dropdown:
       languages: "Langues"
-    signature:
-      greeting: Bonjour,
-      best_regards: Bonne journée,
     notifications:
       actions:
         access: Consulter mon dossier
@@ -100,6 +97,9 @@ fr:
       first: Premier
       truncate: '…'
     shared:
+      greetings:
+        hello: Bonjour,
+        best_regards: Bonne journée,
       dossiers:
         edit:
           autosave: Votre dossier est enregistré automatiquement après chaque modification. Vous pouvez à tout moment fermer la fenêtre et reprendre plus tard là où vous en étiez.