tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use around_action to set locale in admin/notification mailers (#38140)

Browse Source
This commit is contained in:
Matt Jankowski 2026-03-11 06:18:24 -04:00 committed by GitHub
parent d39f867931
commit d047a10cf5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/mailers/admin_mailer.rb
View File

@ -11,30 +11,26 @@ class AdminMailer < ApplicationMailer
after_action :set_important_headers!, only: :new_critical_software_updates after_action :set_important_headers!, only: :new_critical_software_updates
around_action :set_locale
default to: -> { @me.user_email } default to: -> { @me.user_email }
def new_report(report) def new_report(report)
@report = report @report = report
locale_for_account(@me) do mail subject: default_i18n_subject(instance: @instance, id: @report.id)
mail subject: default_i18n_subject(instance: @instance, id: @report.id)
end
end end
def new_appeal(appeal) def new_appeal(appeal)
@appeal = appeal @appeal = appeal
locale_for_account(@me) do mail subject: default_i18n_subject(instance: @instance, username: @appeal.account.username)
mail subject: default_i18n_subject(instance: @instance, username: @appeal.account.username)
end
end end
def new_pending_account(user) def new_pending_account(user)
@account = user.account @account = user.account
locale_for_account(@me) do mail subject: default_i18n_subject(instance: @instance, username: @account.username)
mail subject: default_i18n_subject(instance: @instance, username: @account.username)
end
end end
def new_trends(links, tags, statuses) def new_trends(links, tags, statuses)
@ -42,31 +38,23 @@ class AdminMailer < ApplicationMailer
@tags = tags @tags = tags
@statuses = statuses @statuses = statuses
locale_for_account(@me) do mail subject: default_i18n_subject(instance: @instance)
mail subject: default_i18n_subject(instance: @instance)
end
end end
def new_software_updates def new_software_updates
@software_updates = SoftwareUpdate.by_version @software_updates = SoftwareUpdate.by_version
locale_for_account(@me) do mail subject: default_i18n_subject(instance: @instance)
mail subject: default_i18n_subject(instance: @instance)
end
end end
def new_critical_software_updates def new_critical_software_updates
@software_updates = SoftwareUpdate.urgent.by_version @software_updates = SoftwareUpdate.urgent.by_version
locale_for_account(@me) do mail subject: default_i18n_subject(instance: @instance)
mail subject: default_i18n_subject(instance: @instance)
end
end end
def auto_close_registrations def auto_close_registrations
locale_for_account(@me) do mail subject: default_i18n_subject(instance: @instance)
mail subject: default_i18n_subject(instance: @instance)
end
end end
private private
@ -79,6 +67,10 @@ class AdminMailer < ApplicationMailer
@instance = Rails.configuration.x.local_domain @instance = Rails.configuration.x.local_domain
end end
def set_locale(&block)
locale_for_account(@me, &block)
end
def set_important_headers! def set_important_headers!
headers( headers(
'Importance' => 'high', 'Importance' => 'high',

30
app/mailers/notification_mailer.rb
View File

@ -15,6 +15,8 @@ class NotificationMailer < ApplicationMailer
before_deliver :verify_functional_user before_deliver :verify_functional_user
around_action :set_locale
default to: -> { email_address_with_name(@user.email, @me.username) } default to: -> { email_address_with_name(@user.email, @me.username) }
layout 'mailer' layout 'mailer'
@ -22,45 +24,33 @@ class NotificationMailer < ApplicationMailer
def mention def mention
return if @status.blank? return if @status.blank?
locale_for_account(@me) do mail subject: default_i18n_subject(name: @status.account.acct)
mail subject: default_i18n_subject(name: @status.account.acct)
end
end end
def quote def quote
return if @status.blank? return if @status.blank?
locale_for_account(@me) do mail subject: default_i18n_subject(name: @status.account.acct)
mail subject: default_i18n_subject(name: @status.account.acct)
end
end end
def follow def follow
locale_for_account(@me) do mail subject: default_i18n_subject(name: @account.acct)
mail subject: default_i18n_subject(name: @account.acct)
end
end end
def favourite def favourite
return if @status.blank? return if @status.blank?
locale_for_account(@me) do mail subject: default_i18n_subject(name: @account.acct)
mail subject: default_i18n_subject(name: @account.acct)
end
end end
def reblog def reblog
return if @status.blank? return if @status.blank?
locale_for_account(@me) do mail subject: default_i18n_subject(name: @account.acct)
mail subject: default_i18n_subject(name: @account.acct)
end
end end
def follow_request def follow_request
locale_for_account(@me) do mail subject: default_i18n_subject(name: @account.acct)
mail subject: default_i18n_subject(name: @account.acct)
end
end end
private private
@ -81,6 +71,10 @@ class NotificationMailer < ApplicationMailer
@account = @notification.from_account @account = @notification.from_account
end end
def set_locale(&block)
locale_for_account(@me, &block)
end
def verify_functional_user def verify_functional_user
throw(:abort) unless @user.functional? throw(:abort) unless @user.functional?
end end