From ba39077180d589790115ed1f37b73a55d8ccf6c5 Mon Sep 17 00:00:00 2001
From: Bartosz Balazinski <bartosz.balazinski@interdigital.com>
Date: Wed, 4 Nov 2015 23:25:51 +0000
Subject: [PATCH] This commit fixes bug 1817, commit ready to merge  -
 Legacy-Id: 10425

---
 ietf/doc/mails.py                                           | 6 ++++--
 ietf/submit/utils.py                                        | 6 ++++--
 .../templates/doc/mail/review_possibly_replaces_request.txt | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ietf/doc/mails.py b/ietf/doc/mails.py
index 6f7378567..459b561f8 100644
--- a/ietf/doc/mails.py
+++ b/ietf/doc/mails.py
@@ -437,7 +437,7 @@ def email_stream_tags_changed(request, doc, added_tags, removed_tags, by, commen
                    comment=comment),
               cc=cc)
 
-def send_review_possibly_replaces_request(request, doc):
+def send_review_possibly_replaces_request(request, doc, submitter_info):
     addrs = gather_address_lists('doc_replacement_suggested',doc=doc)
     to = set(addrs.to)
     cc = set(addrs.cc)
@@ -452,9 +452,11 @@ def send_review_possibly_replaces_request(request, doc):
               'Review of suggested possible replacements for %s-%s needed' % (doc.name, doc.rev),
               'doc/mail/review_possibly_replaces_request.txt', 
               dict(doc= doc,
+                   submitter_info=submitter_info,
                    possibly_replaces=doc.related_that_doc("possibly-replaces"),
                    review_url=settings.IDTRACKER_BASE_URL + urlreverse("doc_review_possibly_replaces", kwargs={ "name": doc.name })),
-              cc=list(cc),)
+                   cc=list(cc),
+                   )
 
 def email_charter_internal_review(request, charter):
     addrs = gather_address_lists('charter_internal_review',doc=charter,group=charter.group)
diff --git a/ietf/submit/utils.py b/ietf/submit/utils.py
index 939d1b185..2ddaab3ba 100644
--- a/ietf/submit/utils.py
+++ b/ietf/submit/utils.py
@@ -168,14 +168,16 @@ def post_submission(request, submission):
     submitter_parsed = submission.submitter_parsed()
     if submitter_parsed["name"] and submitter_parsed["email"]:
         submitter = ensure_person_email_info_exists(submitter_parsed["name"], submitter_parsed["email"]).person
+        submitter_info='%s <%s>' % (submitter_parsed["name"], submitter_parsed["email"])
     else:
         submitter = system
+        submitter_info=submitter_parsed["name"]
 
     draft.set_state(State.objects.get(used=True, type="draft", slug="active"))
     DocAlias.objects.get_or_create(name=submission.name, document=draft)
 
     update_authors(draft, submission)
-
+    
     trouble = rebuild_reference_relations(draft, filename=os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.txt' % (submission.name, submission.rev)))
     if trouble:
         log('Rebuild_reference_relations trouble: %s'%trouble)
@@ -226,7 +228,7 @@ def post_submission(request, submission):
     announce_to_authors(request, submission)
 
     if new_possibly_replaces:
-        send_review_possibly_replaces_request(request, draft)
+        send_review_possibly_replaces_request(request, draft, submitter_info)
 
     submission.save()
 
diff --git a/ietf/templates/doc/mail/review_possibly_replaces_request.txt b/ietf/templates/doc/mail/review_possibly_replaces_request.txt
index 100289268..737e9fdb2 100644
--- a/ietf/templates/doc/mail/review_possibly_replaces_request.txt
+++ b/ietf/templates/doc/mail/review_possibly_replaces_request.txt
@@ -1,12 +1,14 @@
 {% autoescape off %}
-{{ doc }} is suggested to replace:
 
+{{ submitter_info }} is suggesting to replace the following document{{ possibly_replaces|length|pluralize }}:
 {% for d in possibly_replaces %}  {{ d.name }}
 {% endfor %}
+with document:
+  {{ doc }}
 
 Please visit
 
   {{ review_url }}
 
-and either accept or decline the suggestion{{ suggested_replaces|pluralize:"s" }}.
+and either accept or decline the suggestion.
 {% endautoescape %}