diff options
author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-08-01 13:07:43 -0700 |
---|---|---|
committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-08-01 13:20:29 -0700 |
commit | 8150689b48716bb016d492d28cef08600a4b315e (patch) | |
tree | a05a2539e894c79ef17698dce0da5a6af0c25bf6 /app/views/notification_mailer | |
parent | b61e3daf983d87c6d2de7e54d420c2e8f5a531e6 (diff) | |
parent | 7ef848256871454a790a9b7cc725053c67ba3da4 (diff) |
Merge upstream (#111)
Diffstat (limited to 'app/views/notification_mailer')
-rw-r--r-- | app/views/notification_mailer/digest.text.erb | 2 | ||||
-rw-r--r-- | app/views/notification_mailer/favourite.text.erb | 2 | ||||
-rw-r--r-- | app/views/notification_mailer/follow.text.erb | 2 | ||||
-rw-r--r-- | app/views/notification_mailer/follow_request.text.erb | 2 | ||||
-rw-r--r-- | app/views/notification_mailer/mention.text.erb | 2 | ||||
-rw-r--r-- | app/views/notification_mailer/reblog.text.erb | 2 |
6 files changed, 6 insertions, 6 deletions
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) %> |