HTML e-mails for UserMailer (#6256)
- premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates
This commit is contained in:
parent
7861c5f108
commit
5276c0a090
104 changed files with 848 additions and 706 deletions
|
@ -8,6 +8,6 @@ Rails.application.config.assets.version = '1.0'
|
|||
|
||||
# Precompile additional assets.
|
||||
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
|
||||
# Rails.application.config.assets.precompile += %w(application_public.js custom.css)
|
||||
# Rails.application.config.assets.precompile += %w()
|
||||
|
||||
Rails.application.config.assets.initialize_on_precompile = true
|
||||
|
|
6
config/initializers/premailer_rails.rb
Normal file
6
config/initializers/premailer_rails.rb
Normal file
|
@ -0,0 +1,6 @@
|
|||
require_relative '../../lib/mastodon/premailer_webpack_strategy'
|
||||
|
||||
Premailer::Rails.config.merge!(remove_ids: true,
|
||||
adapter: :nokogiri,
|
||||
generate_text_part: false,
|
||||
strategies: [PremailerWebpackStrategy])
|
|
@ -17,15 +17,32 @@ en:
|
|||
unconfirmed: You have to confirm your email address before continuing.
|
||||
mailer:
|
||||
confirmation_instructions:
|
||||
action: Verify email address
|
||||
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 e-mail.
|
||||
extra_html: Please also check out our <a href="%{terms_path}">terms of service</a> and <a href="%{policy_path}">privacy policy</a>.
|
||||
subject: 'Mastodon: Confirmation instructions for %{instance}'
|
||||
title: Verify e-mail 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 instance admin if you're locked out of your account.
|
||||
subject: 'Mastodon: 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 instance admin if you're locked out of your account.
|
||||
subject: 'Mastodon: 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}'
|
||||
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'
|
||||
title: Password reset
|
||||
unlock_instructions:
|
||||
subject: 'Mastodon: Unlock instructions'
|
||||
omniauth_callbacks:
|
||||
|
|
|
@ -338,6 +338,7 @@ en:
|
|||
body: "%{reporter} has reported %{target}"
|
||||
subject: New report for %{instance} (#%{id})
|
||||
application_mailer:
|
||||
notification_preferences: Change e-mail preferences
|
||||
salutation: "%{name},"
|
||||
settings: 'Change e-mail preferences: %{link}'
|
||||
signature: Mastodon notifications from %{instance}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue