logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 155ba8fd3a5300b68cb968520d082920a81165fa
parent: e44f03bc712c52d3af60f9accad1133f4b6de9ba
Author: unarist <m.unarist@gmail.com>
Date:   Mon, 31 Jul 2017 07:18:44 +0900

Make salutation of email localizable (#4454)


Diffstat:

Mapp/views/admin_mailer/new_report.text.erb2+-
Mapp/views/notification_mailer/digest.text.erb2+-
Mapp/views/notification_mailer/favourite.text.erb2+-
Mapp/views/notification_mailer/follow.text.erb2+-
Mapp/views/notification_mailer/follow_request.text.erb2+-
Mapp/views/notification_mailer/mention.text.erb2+-
Mapp/views/notification_mailer/reblog.text.erb2+-
Mconfig/locales/en.yml1+
8 files changed, 8 insertions(+), 7 deletions(-)

diff --git 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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:'