diff --git a/app/assets/stylesheets/mail/email.css.scss b/app/assets/stylesheets/mail/email.css.scss index a474a30da1..e6eabf665f 100644 --- a/app/assets/stylesheets/mail/email.css.scss +++ b/app/assets/stylesheets/mail/email.css.scss @@ -55,6 +55,12 @@ p.callout { color: #0096ad; } +p.notice { + font-style: italic; + font-size: 12px; + margin-top: 20px; +} + table.social { background-color: #ebebeb; diff --git a/app/mailers/spree/user_mailer_decorator.rb b/app/mailers/spree/user_mailer_decorator.rb index 778f4d421a..3921d3c648 100644 --- a/app/mailers/spree/user_mailer_decorator.rb +++ b/app/mailers/spree/user_mailer_decorator.rb @@ -9,6 +9,9 @@ Spree::UserMailer.class_eval do # overriding `Devise::Mailer.confirmation_instructions`. def confirmation_instructions(user, _opts) @user = user + @instance = Spree::Config[:site_name] + @contact = ContentConfig.footer_email + subject = t('spree.user_mailer.confirmation_instructions.subject') mail(to: user.email, from: from_address, diff --git a/app/views/spree/user_mailer/confirmation_instructions.html.haml b/app/views/spree/user_mailer/confirmation_instructions.html.haml index 960ec7a51d..1085bced91 100644 --- a/app/views/spree/user_mailer/confirmation_instructions.html.haml +++ b/app/views/spree/user_mailer/confirmation_instructions.html.haml @@ -1,7 +1,7 @@ %h3 = t :email_signup_greeting %p.lead - = t :email_signup_welcome, sitename: Spree::Config[:site_name] + = t :email_signup_welcome, sitename: @instance %p= t :email_confirmation_activate_account %p.callout @@ -13,3 +13,6 @@ = render 'shared/mailers/signoff' = render 'shared/mailers/social_and_contact' + +%p.notice + = t :email_confirmation_notice_unexpected, sitename: @instance, contact: @contact diff --git a/config/locales/en.yml b/config/locales/en.yml index 3cf795c2e9..b1eb199459 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1355,6 +1355,7 @@ To activate your Profile we need to confirm this email address." email_confirmation_link_label: "Confirm this email address ยป" email_confirmation_help_html: "After confirming your email you can access your administration account for this enterprise. See the %{link} to find out more about %{sitename}'s features and to start using your profile or online store." + email_confirmation_notice_unexpected: "You received this message because you signed up on %{sitename}, or were invited to sign up by someone you probably know. If you don't understand why you are receiving this email, please write to %{contact}." email_social: "Connect with Us:" email_contact: "Email us:" email_signoff: "Cheers,"