From cb634216b5bada89321839662e5c982f33622ace Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Thu, 3 May 2012 17:02:55 +0000
Subject: [PATCH] Fix terminology confusion and say "send ballot" rather than
 "issue ballot" to clear up that it is not actually created.  - Legacy-Id:
 4362

---
 ietf/templates/wgcharter/ballot_writeupnotes.html | 2 +-
 ietf/wgcharter/views.py                           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ietf/templates/wgcharter/ballot_writeupnotes.html b/ietf/templates/wgcharter/ballot_writeupnotes.html
index ff6e041b3..1eae25d98 100644
--- a/ietf/templates/wgcharter/ballot_writeupnotes.html
+++ b/ietf/templates/wgcharter/ballot_writeupnotes.html
@@ -22,7 +22,7 @@ form #id_ballot_writeup {
   <div class="actions">
     <a href="{% url doc_writeup name=charter.name %}">Back</a>
     <input type="submit" name="save_ballot_writeup" value="Save Ballot Writeup" />
-    <input style="margin-left: 8px" type="submit" name="issue_ballot" value="Save and {% if reissue %}Re-{% endif %}Issue Ballot" />
+    <input style="margin-left: 8px" type="submit" name="send_ballot" value="Save and {% if reissue %}Re-{% endif %}Send Ballot to the IESG" />
   </div>
 </form>
 
diff --git a/ietf/wgcharter/views.py b/ietf/wgcharter/views.py
index 2b60be16a..8664f6140 100644
--- a/ietf/wgcharter/views.py
+++ b/ietf/wgcharter/views.py
@@ -403,7 +403,7 @@ def ballot_writeupnotes(request, name):
         
     form = BallotWriteupForm(initial=dict(ballot_writeup=existing.text))
 
-    if request.method == 'POST' and ("save_ballot_writeup" in request.POST or "issue_ballot" in request.POST):
+    if request.method == 'POST' and ("save_ballot_writeup" in request.POST or "send_ballot" in request.POST):
         form = BallotWriteupForm(request.POST)
         if form.is_valid():
             t = form.cleaned_data["ballot_writeup"]
@@ -415,7 +415,7 @@ def ballot_writeupnotes(request, name):
                 e.text = t
                 e.save()
 
-            if "issue_ballot" in request.POST and approval:
+            if "send_ballot" in request.POST and approval:
                 if has_role(request.user, "Area Director") and not charter.latest_event(BallotPositionDocEvent, type="changed_ballot_position", ad=login, ballot=ballot):
                     # sending the ballot counts as a yes
                     pos = BallotPositionDocEvent(doc=charter, by=login)
@@ -431,7 +431,7 @@ def ballot_writeupnotes(request, name):
                 e = DocEvent(doc=charter, by=login)
                 e.by = login
                 e.type = "sent_ballot_announcement"
-                e.desc = "Ballot has been issued"
+                e.desc = "Ballot has been sent"
                 e.save()
 
                 return render_to_response('wgcharter/ballot_issued.html',