diff --git a/app/views/admin_mailer/new_report.text.erb b/app/views/admin_mailer/new_report.text.erb index 6fa744bc3..671ae5ca7 100644 --- a/app/views/admin_mailer/new_report.text.erb +++ b/app/views/admin_mailer/new_report.text.erb @@ -1,4 +1,4 @@ -<%= display_name(@me) %>, +<%= raw t('application_mailer.salutation', name: display_name(@me)) %> <%= raw t('admin_mailer.new_report.body', target: @report.target_account.acct, reporter: @report.account.acct) %> diff --git a/app/views/notification_mailer/digest.text.erb b/app/views/notification_mailer/digest.text.erb index b63352978..e0d1f9b8b 100644 --- a/app/views/notification_mailer/digest.text.erb +++ b/app/views/notification_mailer/digest.text.erb @@ -1,4 +1,4 @@ -<%= display_name(@me) %>, +<%= raw t('application_mailer.salutation', name: display_name(@me)) %> <%= raw t('notification_mailer.digest.body', since: l(@since), instance: root_url) %> <% @notifications.each do |notification| %> diff --git a/app/views/notification_mailer/favourite.text.erb b/app/views/notification_mailer/favourite.text.erb index 795045307..2581b4909 100644 --- a/app/views/notification_mailer/favourite.text.erb +++ b/app/views/notification_mailer/favourite.text.erb @@ -1,4 +1,4 @@ -<%= display_name(@me) %>, +<%= raw t('application_mailer.salutation', name: display_name(@me)) %> <%= raw t('notification_mailer.favourite.body', name: @account.acct) %> diff --git a/app/views/notification_mailer/follow.text.erb b/app/views/notification_mailer/follow.text.erb index af41a3080..cbe46f552 100644 --- a/app/views/notification_mailer/follow.text.erb +++ b/app/views/notification_mailer/follow.text.erb @@ -1,4 +1,4 @@ -<%= display_name(@me) %>, +<%= raw t('application_mailer.salutation', name: display_name(@me)) %> <%= raw t('notification_mailer.follow.body', name: @account.acct) %> diff --git a/app/views/notification_mailer/follow_request.text.erb b/app/views/notification_mailer/follow_request.text.erb index 49087a575..a018394b8 100644 --- a/app/views/notification_mailer/follow_request.text.erb +++ b/app/views/notification_mailer/follow_request.text.erb @@ -1,4 +1,4 @@ -<%= display_name(@me) %>, +<%= raw t('application_mailer.salutation', name: display_name(@me)) %> <%= raw t('notification_mailer.follow_request.body', name: @account.acct) %> diff --git a/app/views/notification_mailer/mention.text.erb b/app/views/notification_mailer/mention.text.erb index b38c5a4d0..03f53813b 100644 --- a/app/views/notification_mailer/mention.text.erb +++ b/app/views/notification_mailer/mention.text.erb @@ -1,4 +1,4 @@ -<%= display_name(@me) %>, +<%= raw t('application_mailer.salutation', name: display_name(@me)) %> <%= raw t('notification_mailer.mention.body', name: @status.account.acct) %> diff --git a/app/views/notification_mailer/reblog.text.erb b/app/views/notification_mailer/reblog.text.erb index fd85437a7..8fc841bf6 100644 --- a/app/views/notification_mailer/reblog.text.erb +++ b/app/views/notification_mailer/reblog.text.erb @@ -1,4 +1,4 @@ -<%= display_name(@me) %>, +<%= raw t('application_mailer.salutation', name: display_name(@me)) %> <%= raw t('notification_mailer.reblog.body', name: @account.acct) %> diff --git a/config/locales/en.yml b/config/locales/en.yml index ace83a0f8..90b4fe82b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -215,6 +215,7 @@ en: body: "%{reporter} has reported %{target}" subject: New report for %{instance} (#%{id}) application_mailer: + salutation: '%{name},' settings: 'Change e-mail preferences: %{link}' signature: Mastodon notifications from %{instance} view: 'View:'