Merged in [15679] from mahoney@nostrum.com:

    Verb tense used in Ballot Issued emails now matches whether the LC end date is in the past or future. Fixes issue ietf-tools#2482.
 - Legacy-Id: 15685
Note: SVN reference [15679] has been migrated to Git commit 194d8c8

Author: levkowetz

ietf/doc/mails.py

@@ -363,11 +363,13 @@ def generate_issue_ballot_mail(request, doc, ballot):
 
     e = doc.latest_event(LastCallDocEvent, type="sent_last_call")
     last_call_expires = e.expires if e else None
+    last_call_has_expired = last_call_expires and last_call_expires < datetime.datetime.now()
 
     return render_to_string("doc/mail/issue_ballot_mail.txt",
                             dict(doc=doc,
                                  doc_url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(),
                                  last_call_expires=last_call_expires,
+                                 last_call_has_expired=last_call_has_expired,
                                  needed_ballot_positions=
                                    needed_ballot_positions(doc,
                                      doc.active_ballot().active_ad_positions().values()

ietf/doc/tests_ballot.py

@@ -413,26 +413,44 @@ def test_edit_ballot_rfceditornote(self):
 
     def test_issue_ballot(self):
         ad = Person.objects.get(user__username="ad")
-        draft = IndividualDraftFactory(ad=ad)
-        url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=draft.name))
-        login_testing_unauthorized(self, "ad", url)
-
-
-        empty_outbox()
-        
-        r = self.client.post(url, dict(
-                ballot_writeup="This is a test.",
-                issue_ballot="1"))
-        self.assertEqual(r.status_code, 200)
-        draft = Document.objects.get(name=draft.name)
+        for case in ('none','past','future'):
+            draft = IndividualDraftFactory(ad=ad)
+            if case in ('past','future'):
+                LastCallDocEvent.objects.create(
+                    by=Person.objects.get(name='(System)'),
+                    type='sent_last_call',
+                    doc=draft,
+                    rev=draft.rev,
+                    desc='issued last call',
+                    expires = datetime.datetime.now()+datetime.timedelta(days = 1 if case=='future' else -1)
+                )
+            url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=draft.name))
+            login_testing_unauthorized(self, "ad", url)
+
+
+            empty_outbox()
+            
+            r = self.client.post(url, dict(
+                    ballot_writeup="This is a test.",
+                    issue_ballot="1"))
+            self.assertEqual(r.status_code, 200)
+            draft = Document.objects.get(name=draft.name)
+
+            self.assertTrue(draft.latest_event(type="sent_ballot_announcement"))
+            self.assertEqual(len(outbox), 2)
+            self.assertTrue('Ballot issued:' in outbox[-2]['Subject'])
+            self.assertTrue('iesg@' in outbox[-2]['To'])
+            self.assertTrue('Ballot issued:' in outbox[-1]['Subject'])
+            self.assertTrue('drafts-eval@' in outbox[-1]['To'])
+            self.assertTrue('X-IETF-Draft-string' in outbox[-1])
+            if case=='none':
+                self.assertNotIn('call expire', outbox[-1].get_payload(decode=True).decode("utf-8"))
+            elif case=='past':
+                self.assertIn('call expired', outbox[-1].get_payload(decode=True).decode("utf-8"))
+            else:
+                self.assertIn('call expires', outbox[-1].get_payload(decode=True).decode("utf-8"))
+            self.client.logout()
 
-        self.assertTrue(draft.latest_event(type="sent_ballot_announcement"))
-        self.assertEqual(len(outbox), 2)
-        self.assertTrue('Ballot issued:' in outbox[-2]['Subject'])
-        self.assertTrue('iesg@' in outbox[-2]['To'])
-        self.assertTrue('Ballot issued:' in outbox[-1]['Subject'])
-        self.assertTrue('drafts-eval@' in outbox[-1]['To'])
-        self.assertTrue('X-IETF-Draft-string' in outbox[-1])
 
     def test_edit_approval_text(self):
         ad = Person.objects.get(user__username="ad")

ietf/templates/doc/mail/issue_ballot_mail.txt

@@ -4,9 +4,8 @@ Subject: Ballot issued: {{ doc.file_tag }} to {{ doc|std_level_prompt }}
 
 {% filter wordwrap:78 %}Evaluation for {{ doc.file_tag }} can be found at {{ doc_url }}
 
-{% if last_call_expires %}Last call to expire on: {{ last_call_expires }}
-
-{% endif %}{% endfilter %}
+{% if last_call_expires %}Last call expire{% if last_call_has_expired %}d{% else %}s{% endif %} on: {{ last_call_expires }}{% endif %}
+{% endfilter %}
 {% filter wordwrap:78 %}{{ needed_ballot_positions }}{% endfilter %}
 
 {% endautoescape%}