diff --git a/ietf/doc/mails.py b/ietf/doc/mails.py index ca106c84e..108bcdb77 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,6 +452,7 @@ 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),) diff --git a/ietf/submit/utils.py b/ietf/submit/utils.py index 939d1b185..24c0c5f8c 100644 --- a/ietf/submit/utils.py +++ b/ietf/submit/utils.py @@ -168,8 +168,10 @@ 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 = u'%s <%s>' % (submitter_parsed["name"], submitter_parsed["email"]) else: submitter = system + submitter_info = system.name draft.set_state(State.objects.get(used=True, type="draft", slug="active")) DocAlias.objects.get_or_create(name=submission.name, document=draft) @@ -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..e12d99fbb 100644 --- a/ietf/templates/doc/mail/review_possibly_replaces_request.txt +++ b/ietf/templates/doc/mail/review_possibly_replaces_request.txt @@ -1,4 +1,6 @@ {% autoescape off %} +{{ submitter_info }} has suggested new replaced-by information: + {{ doc }} is suggested to replace: {% for d in possibly_replaces %} {{ d.name }} @@ -8,5 +10,5 @@ Please visit {{ review_url }} -and either accept or decline the suggestion{{ suggested_replaces|pluralize:"s" }}. +and either accept or decline the suggestion. {% endautoescape %}