Explicitly determine approving body and consensus body in publication

requests for alternate streams so that they appear correctly for the
IRTF
 - Legacy-Id: 4897

Author: OleLaursen

ietf/idrfc/mails.py

@@ -291,11 +291,20 @@ def generate_publication_request(request, doc):
 
     e = doc.latest_event(ConsensusDocEvent, type="changed_consensus")
     consensus = e.consensus if e else None
-        
+
+    if doc.stream_id == "irtf":
+        approving_body = "IRSG"
+        consensus_body = doc.group.acronym.upper()
+    else:
+        approving_body = str(doc.stream)
+        consensus_body = approving_body
+
     return render_to_string("idrfc/publication_request.txt",
                             dict(doc=doc,
                                  doc_url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(),
                                  group_description=group_description,
+                                 approving_body=approving_body,
+                                 consensus_body=consensus_body,
                                  consensus=consensus,
                                  )
                             )

ietf/templates/idrfc/publication_request.txt

@@ -1,13 +1,13 @@
 {% load mail_filters %}{% autoescape off %}{% filter wordwrap:73 %}
-The {{ doc.stream }} has approved the following document:
+The {{ approving_body }} has approved the following document in the {{ doc.stream }} stream:
 
 - "{{ doc.title }}" ({{ doc.name }}) as {{ doc|std_level_prompt }}.{% if group_description %}
 
 This document is the product of the {{ group_description }}.{% endif %}{% endfilter %}
 
 URL: {{ doc_url }}
 
-{% filter wordwrap:73 %}{% if consensus != None %}The document {% if consensus %}represents{% else %}does not necessarily represent{% endif%} the consensus of the {{ doc.stream }}.
+{% filter wordwrap:73 %}{% if consensus != None %}The document {% if consensus %}represents{% else %}does not necessarily represent{% endif%} the consensus of the {{ consensus_body }}.
 
 {% endif %}No IANA allocation in the document requires IETF Consensus or Standards Action.{% endfilter %}