Fixed expiration mail phrasing

diff --git a/cron_notify_expired.py b/cron_notify_expired.py
index cba2c00..6f27ddf 100755 (executable)
--- a/cron_notify_expired.py
+++ b/cron_notify_expired.py
@@ -16,8 +16,15 @@ def notify_expired():
                 try:
                     mail_body = render_to_string("rule_expiration.txt",
                                              {"route": route, 'expiration_days':expiration_days})
-                    send_mail(settings.EMAIL_SUBJECT_PREFIX + "Rule %s expires in %s days" %
-                              (route.name,expiration_days),
+                    days_num = ' days'
+                    expiration_days_text = "%s %s" %('in',expiration_days)
+                    if expiration_days == 0:
+                        days_num = ' today'
+                        expiration_days_text = ''
+                    if expiration_days == 1:
+                        days_num = ' day'
+                    send_mail(settings.EMAIL_SUBJECT_PREFIX + "Rule %s expires %s%s" %
+                              (route.name,expiration_days_text, days_num),
                               mail_body, settings.SERVER_EMAIL,
                               [route.applier.email])
                 except Exception as e:

diff --git a/templates/rule_expiration.txt b/templates/rule_expiration.txt
index a371f9b..59955fe 100644 (file)
--- a/templates/rule_expiration.txt
+++ b/templates/rule_expiration.txt
@@ -1,4 +1,4 @@
-Rule {{route.name}} expires in {{expiration_days}} days.
+Rule {{route.name}} expires {% ifequal expiration_days 0 %}today{% else%}in {{expiration_days}} day{{ expiration_days|pluralize }}{% endifequal %}
 
 Match
 * Dst Addr:{{route.destination}}