From 491d65363643ba02a663557bb9b1a4e15d8eae85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Thu, 5 Jul 2018 14:01:12 +0200
Subject: [PATCH] registration: special case activation link being valid for 1
 day (#25075)

---
 .../templates/registration/activation_email.html      |  4 ++++
 .../templates/registration/activation_email.txt       |  4 +++-
 .../templates/registration/registration_complete.html | 11 ++++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/authentic2/templates/registration/activation_email.html b/src/authentic2/templates/registration/activation_email.html
index 26a86be8..2eef213c 100644
--- a/src/authentic2/templates/registration/activation_email.html
+++ b/src/authentic2/templates/registration/activation_email.html
@@ -11,7 +11,11 @@
       </p>
     {% endif %}
 
+    {% if expiration_days > 1 %}
     <p>{% blocktrans %}This link is valid for {{ expiration_days }} days.{% endblocktrans %}</>
+    {% else %}
+    <p>{% blocktrans %}This link is valid for 24 hours.{% endblocktrans %}</>
+    {% endif %}
 
     <p>{% blocktrans %}If you did not register on {{ site }}, ignore this email.{% endblocktrans %}</p>
   </body>
diff --git a/src/authentic2/templates/registration/activation_email.txt b/src/authentic2/templates/registration/activation_email.txt
index f2428520..e623ef6d 100644
--- a/src/authentic2/templates/registration/activation_email.txt
+++ b/src/authentic2/templates/registration/activation_email.txt
@@ -8,6 +8,8 @@ You already have an account. To login please go to:
 
   {{ registration_url }}
 
-{% endblocktrans %}{% endif %}{% blocktrans %}Link is valid for {{ expiration_days }} days.{% endblocktrans %}
+{% endblocktrans %}{% endif %}
+{% if expiration_days > 1 %}{% blocktrans %}Link is valid for {{ expiration_days }} days.{% endblocktrans %}
+{% else %}{% blocktrans %}Link is valid for 24 hours.{% endblocktrans %}{% endif %}
 
 {% blocktrans %}If you did not register on {{ site }}, ignore this email.{% endblocktrans %}{% endautoescape %}
diff --git a/src/authentic2/templates/registration/registration_complete.html b/src/authentic2/templates/registration/registration_complete.html
index 3ab3b627..7eca7a21 100644
--- a/src/authentic2/templates/registration/registration_complete.html
+++ b/src/authentic2/templates/registration/registration_complete.html
@@ -9,8 +9,17 @@
   {% url "auth_homepage" as homepage_url %}
   {% blocktrans with email=request.session.registered_email %}
     <p>An email was sent to {{ email }}.</p>
+  {% endblocktrans %}
+  {% if account_activation_days > 1 %}
+  {% blocktrans %}
     <p>Follow instruction in this email to continue your registration, this
     email will be valid during {{account_activation_days}} days.</p>
-    <p><a href="{{ homepage_url }}">Back</a></p>
   {% endblocktrans %}
+  {% else %}
+  {% blocktrans %}
+    <p>Follow instruction in this email to continue your registration, this
+    email will be valid during 24 hours.</p>
+  {% endblocktrans %}
+  {% endif %}
+  <p><a href="{{ homepage_url }}">{% trans "Back" %}</a></p>
 {% endblock %}
-- 
2.18.0