From 1c7a27b816e348d92961a967c24300d640d494ea Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 30 Mar 2016 12:46:51 +0200 Subject: [PATCH] New activation message --- .../views/emails/confirm-account-html.twig | 25 +++++++++++++------ resources/views/emails/confirm-account.twig | 15 +++++++---- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/resources/views/emails/confirm-account-html.twig b/resources/views/emails/confirm-account-html.twig index 2b9ed4a533..60781fcac8 100644 --- a/resources/views/emails/confirm-account-html.twig +++ b/resources/views/emails/confirm-account-html.twig @@ -7,22 +7,31 @@

- Hey there, + Hey there!

-First of all: delete this email message if you did not expect it. + To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is!

-Otherwise, in order to use your account, please - confirm this email address is yours. + To active your account, click on this link. +

+

+ If the link does not work, you can browse there manually by copy/pasting it:

-

- This link is valid for about 4 hours. + {{ route }} +

+

+ You should be redirected to the index page right away. The link expires in about four hours. +

+

+ Thank you, and enjoy! +

+

+ James Cole

-

- The registration has been created from IP {{ ip }} + You are getting this activation message because a new registration from IP {{ ip }} triggered it.

diff --git a/resources/views/emails/confirm-account.twig b/resources/views/emails/confirm-account.twig index 3d9d3b8087..3fa0b9be14 100644 --- a/resources/views/emails/confirm-account.twig +++ b/resources/views/emails/confirm-account.twig @@ -1,11 +1,16 @@ -Hey there, +Hey there! -First of all: delete this email message if you did not expect it. +To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is! -Otherwise, in order to use your account, please confirm this email address is yours, by clicking on this link: +To active your account, you can click on the following link, or copy/paste it in your web browser: {{ route }} -This link is valid for about 4 hours. +You should be redirected to the index page right away. The link expires in about four hours. -The registration has been created from IP {{ ip }} +Thank you, and enjoy! + +James Cole + + +You are getting this activation message because a new registration from IP {{ ip }} triggered it.