diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 246602b..ba4ca5b 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -16,7 +16,7 @@ @user = user FastGettext.with_locale FastGettext.default_locale do mail(to: @role.user.email, - subject: _('%{user_name} has shared a Data Management Plan with you in %{tool_name}') %{ + subject: d_('dmpopidor', '%{user_name} has shared a Data Management Plan with you in %{tool_name}') %{ :user_name => @user.invited_by.name(false), :tool_name => Rails.configuration.branding[:application][:name] }) diff --git a/app/models/user.rb b/app/models/user.rb index 065e740..c4a3ebb 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -281,7 +281,7 @@ # Override devise_invitable email title # -------------------------------------------------------------- def deliver_invitation(options = {}) - super(options.merge(subject: _('%{user_name} has shared a Data Management Plan with you in %{tool_name}') % { + super(options.merge(subject: d_('dmpopidor', '%{user_name} has shared a Data Management Plan with you in %{tool_name}') % { user_name: self.invited_by.name(false), tool_name: Rails.configuration.branding[:application][:name] })) diff --git a/app/views/devise/mailer/invitation_instructions.html.erb b/app/views/devise/mailer/invitation_instructions.html.erb index c9aef47..319de78 100644 --- a/app/views/devise/mailer/invitation_instructions.html.erb +++ b/app/views/devise/mailer/invitation_instructions.html.erb @@ -11,7 +11,7 @@ <%= _('Hello %{user_email}') %{ :user_email => @resource.email } %>
- <%= _('%{sender_name} has invited you to contribute to their Data Management Plan in %{tool_name}') %{ + <%= d_('dmpopidor', '%{sender_name} has invited you to contribute to their Data Management Plan in %{tool_name}') %{ :sender_name => sender_name, :tool_name => tool_name }%> diff --git a/app/views/user_mailer/sharing_notification.html.erb b/app/views/user_mailer/sharing_notification.html.erb index 3c555d4..996df91 100644 --- a/app/views/user_mailer/sharing_notification.html.erb +++ b/app/views/user_mailer/sharing_notification.html.erb @@ -9,7 +9,7 @@ <%= _('Hello %{user_email}') %{ :user_email => user_email } %>
- <%= _('%{sender_name} has invited you to contribute to their Data Management Plan in %{tool_name}') %{ + <%= d_('dmpopidor', '%{sender_name} has invited you to contribute to their Data Management Plan in %{tool_name}') %{ :sender_name => sender_name, :tool_name => tool_name }%>