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

Merge pull request #6457 from betagouv/fix-localized-emails

Browse source 
i18n : correction des traductions manquantes dans l'email "Retrouvez votre brouillon"
This commit is contained in:
Paul Chavard 2021-09-08 09:36:07 +02:00 committed by GitHub
commit b67cc4a254
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/dossier.rb
View file

@ -382,7 +382,7 @@ class Dossier < ApplicationRecord
validates :groupe_instructeur, presence: true, if: -> { !brouillon? } validates :groupe_instructeur, presence: true, if: -> { !brouillon? }
def user_deleted? def user_deleted?
user_id.nil? persisted? && user_id.nil?
end end
def user_email_for(use) def user_email_for(use)

4
app/views/dossier_mailer/notify_new_answer.html.haml
View file

@ -4,11 +4,11 @@
%p= t(:hello, scope: [:views, :shared, :greetings]) %p= t(:hello, scope: [:views, :shared, :greetings])
- if !@dossier.brouillon? - if !@dossier.brouillon?
%p= t('.body', libelle_demarche: @dossier.procedure.libelle) %p= t('.body_html', libelle_demarche: @dossier.procedure.libelle)
%p= t('.link') %p= t('.link')
= round_button(t('.access_message'), messagerie_dossier_url(@dossier), :primary) = round_button(t('.access_message'), messagerie_dossier_url(@dossier), :primary)
- else - else
%p= t('.body_draft', libelle_demarche: @dossier.procedure.libelle) %p= t('.body_draft_html', libelle_demarche: @dossier.procedure.libelle)
%p{ style: "padding: 8px; color: #333333; background-color: #EEEEEE; font-size: 14px;" } %p{ style: "padding: 8px; color: #333333; background-color: #EEEEEE; font-size: 14px;" }
= @body = @body
%p= t('.contact') %p= t('.contact')

4
app/views/dossier_mailer/notify_new_draft.html.haml
View file

@ -3,8 +3,8 @@
%p= t(:hello, scope: [:views, :shared, :greetings]) %p= t(:hello, scope: [:views, :shared, :greetings])
%p= t('.body', libelle_demarche: @dossier.procedure.libelle) %p= t('.body_html', libelle_demarche: @dossier.procedure.libelle)
%p= t('.link') %p= t('.link_html')
= round_button(t('.access_file'), dossier_url(@dossier), :primary) = round_button(t('.access_file'), dossier_url(@dossier), :primary)
- if @dossier.procedure.auto_archive_on - if @dossier.procedure.auto_archive_on

2
app/views/dossier_mailer/notify_revert_to_instruction.html.haml
View file

@ -4,7 +4,7 @@
%p= t(:hello, scope: [:views, :shared, :greetings]) %p= t(:hello, scope: [:views, :shared, :greetings])
%p %p
= t('.body', dossier_id: @dossier.id, libelle_demarche: @dossier.procedure.libelle) = t('.body_html', dossier_id: @dossier.id, libelle_demarche: @dossier.procedure.libelle)
= link_to dossier_url(@dossier), dossier_url(@dossier), target: '_blank', rel: 'noopener' = link_to dossier_url(@dossier), dossier_url(@dossier), target: '_blank', rel: 'noopener'
- if @dossier.procedure.service.present? - if @dossier.procedure.service.present?
%p %p