CloudToys/REI-Fixed
1
0
Fork 0
Code

Make salutation of email localizable (#4454)

Browse Source
This commit is contained in:
unarist 2017-07-31 07:18:44 +09:00 committed by Eugen Rochko
parent e44f03bc71
commit 155ba8fd3a
8 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin_mailer/new_report.text.erb
View File

@ -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) %> <%= raw t('admin_mailer.new_report.body', target: @report.target_account.acct, reporter: @report.account.acct) %>

2
app/views/notification_mailer/digest.text.erb
View File

@ -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) %> <%= raw t('notification_mailer.digest.body', since: l(@since), instance: root_url) %>
<% @notifications.each do |notification| %> <% @notifications.each do |notification| %>

2
app/views/notification_mailer/favourite.text.erb
View File

@ -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) %> <%= raw t('notification_mailer.favourite.body', name: @account.acct) %>

2
app/views/notification_mailer/follow.text.erb
View File

@ -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) %> <%= raw t('notification_mailer.follow.body', name: @account.acct) %>

2
app/views/notification_mailer/follow_request.text.erb
View File

@ -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) %> <%= raw t('notification_mailer.follow_request.body', name: @account.acct) %>

2
app/views/notification_mailer/mention.text.erb
View File

@ -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) %> <%= raw t('notification_mailer.mention.body', name: @status.account.acct) %>

2
app/views/notification_mailer/reblog.text.erb
View File

@ -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) %> <%= raw t('notification_mailer.reblog.body', name: @account.acct) %>

1
config/locales/en.yml
View File

@ -215,6 +215,7 @@ en:
body: "%{reporter} has reported %{target}" body: "%{reporter} has reported %{target}"
subject: New report for %{instance} (#%{id}) subject: New report for %{instance} (#%{id})
application_mailer: application_mailer:
salutation: '%{name},'
settings: 'Change e-mail preferences: %{link}' settings: 'Change e-mail preferences: %{link}'
signature: Mastodon notifications from %{instance} signature: Mastodon notifications from %{instance}
view: 'View:' view: 'View:'