This website works better with JavaScript.
Home
Explore
Help
Sign In
closed-social
/
mastodon
Watch
3
Star
0
Fork
2
Code
Issues
5
Pull Requests
0
Projects
0
Releases
3
Wiki
Activity
Browse Source
Make salutation of email localizable (
#4454
)
pull/4/head
unarist
6 years ago
committed by
Eugen Rochko
parent
e44f03bc71
commit
155ba8fd3a
8 changed files
with
8 additions
and
7 deletions
Split View
Diff Options
Show Stats
Download Patch File
Download Diff File
+1
-1
app/views/admin_mailer/new_report.text.erb
+1
-1
app/views/notification_mailer/digest.text.erb
+1
-1
app/views/notification_mailer/favourite.text.erb
+1
-1
app/views/notification_mailer/follow.text.erb
+1
-1
app/views/notification_mailer/follow_request.text.erb
+1
-1
app/views/notification_mailer/mention.text.erb
+1
-1
app/views/notification_mailer/reblog.text.erb
+1
-0
config/locales/en.yml
+ 1
- 1
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) %>
+ 1
- 1
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) %>
<% @notifications.each do |notification| %>
+ 1
- 1
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) %>
+ 1
- 1
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) %>
+ 1
- 1
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) %>
+ 1
- 1
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) %>
+ 1
- 1
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) %>
+ 1
- 0
config/locales/en.yml
View File
@ -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:'
Write
Preview
Loading…
Cancel
Save