diff --git a/app/views/invitation_mailer/invite_email.html.erb b/app/views/invitation_mailer/invite_email.html.erb index 2cc3f462777..c57be0a9492 100644 --- a/app/views/invitation_mailer/invite_email.html.erb +++ b/app/views/invitation_mailer/invite_email.html.erb @@ -3,9 +3,9 @@

<%= t(".body", inviter: @invitation.inviter.display_name, - family: @invitation.family.name) %> + family: @invitation.family.name).html_safe %>

<%= link_to t(".accept_button"), @accept_url, class: "button" %> -

<%= t(".expiry_notice", days: 3) %>

\ No newline at end of file + \ No newline at end of file diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index 3aac9002edc..2d6f8c06d7e 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -2,12 +2,56 @@ + - <%= yield %> +
+ <%= yield %> +
diff --git a/config/locales/mailers/invitation_mailer/en.yml b/config/locales/mailers/invitation_mailer/en.yml index 0d6e0065450..1bb494e83e9 100644 --- a/config/locales/mailers/invitation_mailer/en.yml +++ b/config/locales/mailers/invitation_mailer/en.yml @@ -1,7 +1,7 @@ en: invitation_mailer: invite_email: - subject: "%{inviter} has invited you to join their household" + subject: "%{inviter} has invited you to join their household on Maybe!" greeting: "You've been invited!" body: "%{inviter} has invited you to join their household '%{family}' as a %{role}." accept_button: "Accept Invitation" diff --git a/config/locales/views/invitation_mailer/en.yml b/config/locales/views/invitation_mailer/en.yml index d9e81712921..650377213ff 100644 --- a/config/locales/views/invitation_mailer/en.yml +++ b/config/locales/views/invitation_mailer/en.yml @@ -1,7 +1,7 @@ en: invitation_mailer: invite_email: - greeting: "Welcome!" + greeting: "Welcome to Maybe!" body: "%{inviter} has invited you to join the %{family} family on Maybe!" accept_button: "Accept Invitation" expiry_notice: "This invitation will expire in %{days} days"