diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index b494e62fb..99f8de5ed 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -17,7 +17,7 @@ class UserMailer < Devise::Mailer I18n.with_locale(@resource.locale || I18n.default_locale) do mail to: @resource.unconfirmed_email.presence || @resource.email, - subject: I18n.t(@resource.pending_reconfirmation? ? 'devise.mailer.reconfirmation_instructions.subject' : 'devise.mailer.confirmation_instructions.subject', instance: @instance), + subject: I18n.t(@resource.pending_reconfirmation? ? 'devise.mailer.reconfirmation_instructions.subject' : 'devise.mailer.confirmation_instructions.subject', instance: @instance, title: Setting.site_title), template_name: @resource.pending_reconfirmation? ? 'reconfirmation_instructions' : 'confirmation_instructions' end end @@ -30,7 +30,7 @@ class UserMailer < Devise::Mailer return if @resource.disabled? I18n.with_locale(@resource.locale || I18n.default_locale) do - mail to: @resource.email, subject: I18n.t('devise.mailer.reset_password_instructions.subject') + mail to: @resource.email, subject: I18n.t('devise.mailer.reset_password_instructions.subject', title: Setting.site_title) end end @@ -41,7 +41,7 @@ class UserMailer < Devise::Mailer return if @resource.disabled? I18n.with_locale(@resource.locale || I18n.default_locale) do - mail to: @resource.email, subject: I18n.t('devise.mailer.password_change.subject') + mail to: @resource.email, subject: I18n.t('devise.mailer.password_change.subject', title: Setting.site_title) end end @@ -52,7 +52,7 @@ class UserMailer < Devise::Mailer return if @resource.disabled? I18n.with_locale(@resource.locale || I18n.default_locale) do - mail to: @resource.email, subject: I18n.t('devise.mailer.email_changed.subject') + mail to: @resource.email, subject: I18n.t('devise.mailer.email_changed.subject', title: Setting.site_title) end end @@ -75,7 +75,7 @@ class UserMailer < Devise::Mailer return if @resource.disabled? I18n.with_locale(@resource.locale || I18n.default_locale) do - mail to: @resource.email, subject: I18n.t('user_mailer.backup_ready.subject') + mail to: @resource.email, subject: I18n.t('user_mailer.backup_ready.subject', title: Setting.site_title) end end diff --git a/app/views/user_mailer/reconfirmation_instructions.html.haml b/app/views/user_mailer/reconfirmation_instructions.html.haml index 7f10ba94f..c02d44724 100644 --- a/app/views/user_mailer/reconfirmation_instructions.html.haml +++ b/app/views/user_mailer/reconfirmation_instructions.html.haml @@ -57,4 +57,4 @@ %tbody %tr %td.column-cell.text-center.padded - %p= t 'devise.mailer.reconfirmation_instructions.extra' + %p= t 'devise.mailer.reconfirmation_instructions.extra', title: site_title diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index 2930733c0..a5ca02c77 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -23,28 +23,28 @@ en: explanation: You have created an account on %{host} with this email address. You are one click away from activating it. If this wasn't you, please ignore this email. explanation_when_pending: You applied for an invite to %{host} with this email address. Once you confirm your e-mail address, we will review your application. You can't login until then. If your application is rejected, your data will be removed, so no further action will be required from you. If this wasn't you, please ignore this email. extra_html: Please also check out the rules of the server and our terms of service. - subject: 'Mastodon: Confirmation instructions for %{instance}' + subject: '%{title}: Confirmation instructions' title: Verify email address email_changed: explanation: 'The email address for your account is being changed to:' extra: If you did not change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account. - subject: 'Mastodon: Email changed' + subject: '%{title}: Email changed' title: New email address password_change: explanation: The password for your account has been changed. extra: If you did not change your password, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account. - subject: 'Mastodon: Password changed' + subject: '%{title}: Password changed' title: Password changed reconfirmation_instructions: explanation: Confirm the new address to change your email. - extra: If this change wasn't initiated by you, please ignore this email. The email address for the Mastodon account won't change until you access the link above. - subject: 'Mastodon: Confirm email for %{instance}' + extra: If this change wasn't initiated by you, please ignore this email. The email address for the %{title} account won't change until you access the link above. + subject: '%{title}: Confirm email' title: Verify email address reset_password_instructions: action: Change password explanation: You requested a new password for your account. extra: If you didn't request this, please ignore this email. Your password won't change until you access the link above and create a new one. - subject: 'Mastodon: Reset password instructions' + subject: '%{title}: Reset password instructions' title: Password reset unlock_instructions: subject: 'Mastodon: Unlock instructions'