mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 13:35:07 +01:00
Code Issues Projects Releases Wiki Activity

Use admin_mailer layout with initial salutation (#28085)

Browse Source
This commit is contained in:
Matt Jankowski 2023-11-28 02:41:26 -05:00 committed by GitHub
parent 10b879bd5e
commit 2d536bb05f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mailers/admin_mailer.rb
View File

@ -1,6 +1,8 @@
# frozen_string_literal: true # frozen_string_literal: true
class AdminMailer < ApplicationMailer class AdminMailer < ApplicationMailer
layout 'admin_mailer'
helper :accounts helper :accounts
helper :languages helper :languages

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

@ -1,5 +1,3 @@
<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
<%= raw t('admin_mailer.new_appeal.body', target: @appeal.account.username, action_taken_by: @appeal.strike.account.username, date: l(@appeal.strike.created_at, format: :with_time_zone), type: t(@appeal.strike.action, scope: 'admin_mailer.new_appeal.actions')) %> <%= raw t('admin_mailer.new_appeal.body', target: @appeal.account.username, action_taken_by: @appeal.strike.account.username, date: l(@appeal.strike.created_at, format: :with_time_zone), type: t(@appeal.strike.action, scope: 'admin_mailer.new_appeal.actions')) %>
> <%= raw word_wrap(@appeal.text, break_sequence: "\n> ") %> > <%= raw word_wrap(@appeal.text, break_sequence: "\n> ") %>

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

@ -1,5 +1,3 @@
<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
<%= raw t('admin_mailer.new_critical_software_updates.body') %> <%= raw t('admin_mailer.new_critical_software_updates.body') %>
<%= raw t('application_mailer.view')%> <%= admin_software_updates_url %> <%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>

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

@ -1,5 +1,3 @@
<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
<%= raw t('admin_mailer.new_pending_account.body') %> <%= raw t('admin_mailer.new_pending_account.body') %>
<%= @account.user_email %> (@<%= @account.username %>) <%= @account.user_email %> (@<%= @account.username %>)

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

@ -1,5 +1,3 @@
<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
<%= raw(@report.account.local? ? t('admin_mailer.new_report.body', target: @report.target_account.pretty_acct, reporter: @report.account.pretty_acct) : t('admin_mailer.new_report.body_remote', target: @report.target_account.acct, domain: @report.account.domain)) %> <%= raw(@report.account.local? ? t('admin_mailer.new_report.body', target: @report.target_account.pretty_acct, reporter: @report.account.pretty_acct) : t('admin_mailer.new_report.body_remote', target: @report.target_account.acct, domain: @report.account.domain)) %>
<%= raw t('application_mailer.view')%> <%= admin_report_url(@report) %> <%= raw t('application_mailer.view')%> <%= admin_report_url(@report) %>

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

@ -1,5 +1,3 @@
<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
<%= raw t('admin_mailer.new_software_updates.body') %> <%= raw t('admin_mailer.new_software_updates.body') %>
<%= raw t('application_mailer.view')%> <%= admin_software_updates_url %> <%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>

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

@ -1,5 +1,3 @@
<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
<%= raw t('admin_mailer.new_trends.body') %> <%= raw t('admin_mailer.new_trends.body') %>
<%= render partial: 'new_trending_links', object: @links unless @links.empty? %> <%= render partial: 'new_trending_links', object: @links unless @links.empty? %>

3
app/views/layouts/admin_mailer.text.erb Normal file
View File

@ -0,0 +1,3 @@
<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
<%= yield %>