diff --git a/app/views/admin_mailer/new_report.text.erb b/app/views/admin_mailer/new_report.text.erb index 6fa744bc3d19e71fa031ffb9f11392e5dafdab46..671ae5ca7061c097038d0e0c5e95a85af6e13e20 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 b6335297872b5ed42aa887b8f999d5f0eaa2bb51..e0d1f9b8b9d0bd9563130e30731597bfe52a82db 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 795045307fdb2cd3a456a780ca3ebcbdec7c060d..2581b4909b2c0ee97d54f6a32b5bc404b9ba9593 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 af41a3080e4a32566a43c78322ac947368b59261..cbe46f552417ecef37e979f1b65aaa6e1dd5cdb5 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 49087a575ef0a2c848b1a757ed6443857a4428ae..a018394b85786f804f6cee1ccfa655dc0f2751c6 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 b38c5a4d06ed28bdcba7b5a9f01e852084b17f24..03f53813b92a30e82081bed4ce23526a859f1e44 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 fd85437a7def99be57f5cc124bc9638c11d8676e..8fc841bf6e89bdebe30994bf60279ba225a873cc 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 ace83a0f811246b09b7281eb95420af88c53dd8b..90b4fe82bcce26df442ec18cca61d8222717d5bf 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:'