From b6a057673ad900e2a6d99ac0248bc2696e6182b7 Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Thu, 3 May 2012 16:15:20 +0000
Subject: [PATCH] Fix wording of send ballot comment, the actual text was still
specific to drafts. - Legacy-Id: 4360
---
ietf/idrfc/views_ballot.py | 13 +++++++++----
ietf/templates/idrfc/ballot_comment_mail.txt | 8 +++++---
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ietf/idrfc/views_ballot.py b/ietf/idrfc/views_ballot.py
index 5bca574d2..64b6520b1 100644
--- a/ietf/idrfc/views_ballot.py
+++ b/ietf/idrfc/views_ballot.py
@@ -469,9 +469,11 @@ def send_ballot_commentREDESIGN(request, name, ballot_id):
subj = []
d = ""
+ blocking_name = "DISCUSS"
if pos.pos.blocking and pos.discuss:
d = pos.discuss
- subj.append(pos.pos.name.upper())
+ blocking_name = pos.pos.name.upper()
+ subj.append(blocking_name)
c = ""
if pos.comment:
c = pos.comment
@@ -482,10 +484,13 @@ def send_ballot_commentREDESIGN(request, name, ballot_id):
if subj:
subject += ": (with %s)" % " and ".join(subj)
- doc.filename = doc.name # compatibility attributes
- doc.revision_display = doc.rev
body = render_to_string("idrfc/ballot_comment_mail.txt",
- dict(discuss=d, comment=c, ad=ad.plain_name(), doc=doc, pos=pos.pos))
+ dict(discuss=d,
+ comment=c,
+ ad=ad.plain_name(),
+ doc=doc,
+ pos=pos.pos,
+ blocking_name=blocking_name,))
frm = ad.role_email("ad").formatted_email()
to = "The IESG <iesg@ietf.org>"
diff --git a/ietf/templates/idrfc/ballot_comment_mail.txt b/ietf/templates/idrfc/ballot_comment_mail.txt
index cd442df96..4fba5146e 100644
--- a/ietf/templates/idrfc/ballot_comment_mail.txt
+++ b/ietf/templates/idrfc/ballot_comment_mail.txt
@@ -1,19 +1,21 @@
{% autoescape off %}{{ ad }} has entered the following ballot position for
-{{ doc.filename }}-{{ doc.revision_display }}: {{ pos.name }}
+{{ doc.name }}-{{ doc.rev }}: {{ pos.name }}
When responding, please keep the subject line intact and reply to all
email addresses included in the To and CC lines. (Feel free to cut this
introductory paragraph, however.)
+{% if doc.type_id == "draft" %}
Please refer to http://www.ietf.org/iesg/statement/discuss-criteria.html
for more information about IESG DISCUSS and COMMENT positions.
+{% endif %}
{% if not discuss and not comment %}
-There is no DISCUSS or COMMENT text associated with this position.
+There are no remarks associated with this position.
{% endif %}
{% if discuss %}----------------------------------------------------------------------
-DISCUSS:
+{{ blocking_name }}:
----------------------------------------------------------------------
{{ discuss|safe|wordwrap:73 }}