Merged in [17797] from rjsparks@nostrum.com:

    Better use of group type in interim announcement tools. Fixes ietf-tools#2989.
 - Legacy-Id: 17809
Note: SVN reference [17797] has been migrated to Git commit 9ba71be

Author: levkowetz

ietf/meeting/helpers.py

@@ -401,7 +401,7 @@ def get_announcement_initial(meeting, is_change=False):
     addrs = gather_address_lists('interim_announced',group=group).as_strings()
     initial['to'] = addrs.to
     initial['cc'] = addrs.cc
-    initial['frm'] = settings.INTERIM_ANNOUNCE_FROM_EMAIL
+    initial['frm'] = settings.INTERIM_ANNOUNCE_FROM_EMAIL_PROGRAM if group.type_id=='program' else settings.INTERIM_ANNOUNCE_FROM_EMAIL_DEFAULT
     if in_person:
         desc = 'Interim'
     else:
@@ -410,12 +410,9 @@ def get_announcement_initial(meeting, is_change=False):
         change = ' CHANGED'
     else:
         change = ''
-    if group.type.slug == 'rg':
-        type = 'RG'
-    elif group.type.slug == 'wg' and group.state.slug == 'bof':
+    type = group.type.slug.upper()
+    if group.type.slug == 'wg' and group.state.slug == 'bof':
         type = 'BOF'
-    else:
-        type = 'WG'
     initial['subject'] = '{name} ({acronym}) {type} {desc} Meeting: {date}{change}'.format(
         name=group.name, 
         acronym=group.acronym,
@@ -547,7 +544,7 @@ def send_interim_cancellation_notice(meeting):
     session = meeting.session_set.first()
     group = session.group
     (to_email, cc_list) = gather_address_lists('interim_cancelled',group=group)
-    from_email = settings.INTERIM_ANNOUNCE_FROM_EMAIL
+    from_email = settings.INTERIM_ANNOUNCE_FROM_EMAIL_PROGRAM if group.type_id=='program' else settings.INTERIM_ANNOUNCE_FROM_EMAIL_DEFAULT
     subject = '{group} ({acronym}) {type} Interim Meeting Cancelled (was {date})'.format(
         group=group.name,
         acronym=group.acronym,

ietf/settings.py

@@ -764,7 +764,8 @@ def skip_unreadable_post(record):
 IDSUBMIT_ANNOUNCE_LIST_EMAIL = 'i-d-announce@ietf.org'
 
 # Interim Meeting Tool settings
-INTERIM_ANNOUNCE_FROM_EMAIL = 'IESG Secretary <iesg-secretary@ietf.org>'
+INTERIM_ANNOUNCE_FROM_EMAIL_DEFAULT = 'IESG Secretary <iesg-secretary@ietf.org>'
+INTERIM_ANNOUNCE_FROM_EMAIL_PROGRAM = 'IAB Executive Administrative Manager <execd@iab.org>'
 VIRTUAL_INTERIMS_REQUIRE_APPROVAL = False
 INTERIM_SESSION_MINIMUM_MINUTES = 30
 INTERIM_SESSION_MAXIMUM_MINUTES = 300

ietf/templates/meeting/interim_announcement.txt

@@ -1,6 +1,6 @@
 {% load ietf_filters %}{% if is_change %}MEETING DETAILS HAVE CHANGED.  SEE LATEST DETAILS BELOW.
 
-{% endif %}The {{ group.name }} ({{ group.acronym }}) {% if group.type.slug == "rg" %}Research Group{% elif group.state.slug == "active" %}Working Group{% elif group.state.slug == 'bof' %}BOF{% endif %} will hold
+{% endif %}The {{ group.name }} ({{ group.acronym }}) {% if group.type.slug == 'wg' and group.state.slug == 'bof' %}BOF{% else %}{{group.type.name}}{% endif %} will hold
 {% if meeting.session_set.count == 1 %}a{% if meeting.city %}n {% else %} virtual {% endif %}interim meeting on {{ meeting.date }} from {{ meeting.schedule.assignments.first.timeslot.time | date:"H:i" }} to {{ meeting.schedule.assignments.first.timeslot.end_time | date:"H:i" }} {{ meeting.time_zone}}{% if meeting.time_zone != 'UTC' %} ({{ meeting.schedule.assignments.first.timeslot.utc_start_time | date:"H:i" }} to {{ meeting.schedule.assignments.first.timeslot.utc_end_time | date:"H:i" }} UTC){% endif %}.
 {% else %}a multi-day {% if not meeting.city %}virtual {% endif %}interim meeting.