From 99e8be84157412da482cfe4e0062fe77c22beacd Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Mon, 2 Jul 2018 18:38:48 +0200
Subject: [PATCH] Mailers recurrent failures: conditional display for dates

---
 .../domain_recurrent_failures.en.html.erb             | 11 ++++++++---
 .../domain_recurrent_failures.en.text.erb             |  4 ++++
 .../domain_recurrent_failures.fr.html.erb             | 11 ++++++++---
 .../domain_recurrent_failures.fr.text.erb             |  7 +++++++
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/views/notifications_mailer/domain_recurrent_failures.en.html.erb b/app/views/notifications_mailer/domain_recurrent_failures.en.html.erb
index 5584f9b..2146dbc 100644
--- a/app/views/notifications_mailer/domain_recurrent_failures.en.html.erb
+++ b/app/views/notifications_mailer/domain_recurrent_failures.en.html.erb
@@ -8,9 +8,14 @@
 </p>
 
 <p>
-  Our last known expiry date is <%= format_utc(@check.domain_expires_at) %>.
-  <br />
-  Our last successful check occured <%= format_utc(@check.last_success_at) %>.
+  <%- if @check.domain_expires_at.present? %>
+    Our last known expiry date is <%= format_utc(@check.domain_expires_at) %>.
+    <br />
+  <% end %>
+
+  <%- if @check.last_success_at.present? %>
+    Our last successful check occured <%= format_utc(@check.last_success_at) %>.
+  <% end %>
 </p>
 
 <p>
diff --git a/app/views/notifications_mailer/domain_recurrent_failures.en.text.erb b/app/views/notifications_mailer/domain_recurrent_failures.en.text.erb
index a54d658..b5ce466 100644
--- a/app/views/notifications_mailer/domain_recurrent_failures.en.text.erb
+++ b/app/views/notifications_mailer/domain_recurrent_failures.en.text.erb
@@ -3,8 +3,12 @@ Hi,
 We had recurrent failures while checking the whois database for domain
 <%= @check.domain %>. As of today, we can't anymore verify the expiry date.
 
+<%- if @check.domain_expires_at.present? %>
 The last known expiry date is <%= format_utc(@check.domain_expires_at) %>.
+<% end %>
+<%- if @check.last_success_at.present? %>
 The last successful check occured <%= format_utc(@check.last_success_at) %>.
+<% end %>
 
 If you have deleted your domain or have not renewed it, please disable
 or delete the check by following this link:
diff --git a/app/views/notifications_mailer/domain_recurrent_failures.fr.html.erb b/app/views/notifications_mailer/domain_recurrent_failures.fr.html.erb
index 770a090..7da5aed 100644
--- a/app/views/notifications_mailer/domain_recurrent_failures.fr.html.erb
+++ b/app/views/notifications_mailer/domain_recurrent_failures.fr.html.erb
@@ -8,9 +8,14 @@
 </p>
 
 <p>
-  La dernière date d'expiration connue est le <%= format_utc(@check.domain_expires_at) %>.
-  <br />
-  Notre dernière vérification réussie a eu lieu le <%= format_utc(@check.last_success_at) %>.
+  <%- if @check.domain_expires_at.present? %>
+    La dernière date d'expiration connue est le <%= format_utc(@check.domain_expires_at) %>.
+    <br />
+  <% end %>
+
+  <%- if @check.last_success_at.present? %>
+    Notre dernière vérification réussie a eu lieu le <%= format_utc(@check.last_success_at) %>.
+  <% end %>
 </p>
 
 <p>
diff --git a/app/views/notifications_mailer/domain_recurrent_failures.fr.text.erb b/app/views/notifications_mailer/domain_recurrent_failures.fr.text.erb
index 89e3e14..cb8673e 100644
--- a/app/views/notifications_mailer/domain_recurrent_failures.fr.text.erb
+++ b/app/views/notifications_mailer/domain_recurrent_failures.fr.text.erb
@@ -4,6 +4,13 @@ Nous avons rencontré de multiples erreurs pendant l'exécution des vérificatio
 du domaine <strong><%= @check.domain %></strong>.
 Nous ne pouvons plus interroger la base Whois pour vérifier la date d'expiration.
 
+<%- if @check.domain_expires_at.present? %>
+La dernière date d'expiration connue est le <%= format_utc(@check.domain_expires_at) %>.
+<% end %>
+<%- if @check.last_success_at.present? %>
+Notre dernière vérification réussie a eu lieu le <%= format_utc(@check.last_success_at) %>.
+<% end %>
+
 Si vous avez supprimé le domaine ou ne l'avez pas renouvellé,
 merci de désactiver la vérification associée, avec ce lien :
 <%= edit_check_url(@check) %>