From 82f9fd7dce72fa69ddc9cdeff72dbf0c7bf0a930 Mon Sep 17 00:00:00 2001
From: Misty De Meo <mistydemeo@gmail.com>
Date: Sat, 13 Dec 2025 14:34:09 -0800
Subject: [PATCH] user_mailer: try adjusting closer to upstream

---
 app/mailers/user_mailer.rb | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 6a39cdca4..c004e1c6b 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -38,7 +38,7 @@ class UserMailer < Devise::Mailer
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale(use_current_locale: true)) do
-      mail subject: I18n.t('devise.mailer.reset_password_instructions.subject', title: Setting.site_title)
+      mail subject: default_devise_subject
     end
   end
 
@@ -48,7 +48,7 @@ class UserMailer < Devise::Mailer
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale(use_current_locale: true)) do
-      mail subject: I18n.t('devise.mailer.password_change.subject', title: Setting.site_title)
+      mail subject: default_devise_subject
     end
   end
 
@@ -58,7 +58,7 @@ class UserMailer < Devise::Mailer
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale(use_current_locale: true)) do
-      mail subject: I18n.t('devise.mailer.email_changed.subject', title: Setting.site_title)
+      mail subject: default_devise_subject
     end
   end
 
@@ -68,7 +68,7 @@ class UserMailer < Devise::Mailer
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale(use_current_locale: true)) do
-      mail subject: I18n.t('devise.mailer.two_factor_enabled.subject', title: Setting.site_title)
+      mail subject: default_devise_subject
     end
   end
 
@@ -78,7 +78,7 @@ class UserMailer < Devise::Mailer
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale(use_current_locale: true)) do
-      mail subject: I18n.t('devise.mailer.two_factor_disabled.subject', title: Setting.site_title)
+      mail subject: default_devise_subject
     end
   end
 
@@ -88,7 +88,7 @@ class UserMailer < Devise::Mailer
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale(use_current_locale: true)) do
-      mail subject: I18n.t('devise.mailer.two_factor_recovery_codes_changed.subject', title: Setting.site_title)
+      mail subject: default_devise_subject
     end
   end
 
@@ -98,7 +98,7 @@ class UserMailer < Devise::Mailer
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale(use_current_locale: true)) do
-      mail subject: I18n.t('devise.mailer.webauthn_enabled.subject', title: Setting.site_title)
+      mail subject: default_devise_subject
     end
   end
 
@@ -108,7 +108,7 @@ class UserMailer < Devise::Mailer
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale(use_current_locale: true)) do
-      mail I18n.t('devise.mailer.webauthn_disabled.subject', title: Setting.site_title)
+      mail subject: default_devise_subject
     end
   end
 
@@ -146,7 +146,7 @@ class UserMailer < Devise::Mailer
     @has_statuses = @resource.account.statuses.exists?
 
     I18n.with_locale(locale) do
-      mail subject: I18n.t('user_mailer.welcome.subject', title: Setting.site_title)
+      mail subject: default_i18n_subject(title: Setting.site_title)
     end
   end
 
@@ -157,7 +157,7 @@ class UserMailer < Devise::Mailer
     return unless @resource.active_for_authentication?
 
     I18n.with_locale(locale) do
-      mail subject: I18n.t('user_mailer.backup_ready.subject', title: Setting.site_title)
+      mail subject: default_i18n_subject(title: Setting.site_title)
     end
   end
 
@@ -176,7 +176,7 @@ class UserMailer < Devise::Mailer
     @appeal   = appeal
 
     I18n.with_locale(locale) do
-      mail subject: I18n.t('user_mailer.appeal_approved.subject', date: l(@appeal.created_at), title: Setting.site_title)
+      mail subject: default_i18n_subject(date: l(@appeal.created_at), title: Setting.site_title)
     end
   end
 
@@ -185,7 +185,7 @@ class UserMailer < Devise::Mailer
     @appeal   = appeal
 
     I18n.with_locale(locale) do
-      mail subject: I18n.t('user_mailer.appeal_rejected.subject', date: l(@appeal.created_at), title: Setting.site_title)
+      mail subject: default_i18n_subject(date: l(@appeal.created_at), title: Setting.site_title)
     end
   end
 
@@ -197,7 +197,7 @@ class UserMailer < Devise::Mailer
     @timestamp  = timestamp.to_time.utc
 
     I18n.with_locale(locale) do
-      mail subject: I18n.t('user_mailer.suspicious_sign_in.subject', title: Setting.site_title)
+      mail subject: default_i18n_subject(title: Setting.site_title)
     end
   end
 
@@ -209,7 +209,7 @@ class UserMailer < Devise::Mailer
     @timestamp  = timestamp.to_time.utc
 
     I18n.with_locale(locale) do
-      mail subject: default_i18n_subject
+      mail subject: default_i18n_subject(title: Setting.site_title)
     end
   end
 
@@ -219,7 +219,7 @@ class UserMailer < Devise::Mailer
     @markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, escape_html: true, no_images: true)
 
     I18n.with_locale(locale) do
-      mail subject: default_i18n_subject
+      mail subject: default_i18n_subject(title: Setting.site_title)
     end
   end
 
@@ -228,7 +228,7 @@ class UserMailer < Devise::Mailer
     @announcement = announcement
 
     I18n.with_locale(locale) do
-      mail subject: default_i18n_subject
+      mail subject: default_i18n_subject(title: Setting.site_title)
     end
   end