From d7ca2c31d77b594d61c52c30a86727a930f90726 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 22 Aug 2019 20:18:47 +0000 Subject: [PATCH] Add To and Subject headers to all E-mail templates Our election results announcement templates had headers for To and Subject, but the bulk of our E-mail templates had neither. Update the existing ones to reflect the transition from the openstack-dev ML to openstack-discuss, and add appropriate headers to all other templates lacking them. Change-Id: Ic606143e1deb7d669f09e26cdfbe0a2bce103ad3 --- doc/source/_exts/ptl_announce.jinja | 2 +- doc/source/_exts/tc_announce.jinja | 2 +- openstack_election/templates/combined_election_season.j2 | 3 +++ openstack_election/templates/ptl_election_season.j2 | 3 +++ openstack_election/templates/ptl_end_nominations.j2 | 3 +++ openstack_election/templates/ptl_nominations_kickoff.j2 | 3 +++ openstack_election/templates/ptl_nominations_last_days.j2 | 3 +++ openstack_election/templates/ptl_voting_kickoff.j2 | 3 +++ openstack_election/templates/ptl_voting_last_days.j2 | 3 +++ openstack_election/templates/tc_campaigning_kickoff.j2 | 3 +++ openstack_election/templates/tc_election_season.j2 | 3 +++ openstack_election/templates/tc_end_nominations.j2 | 3 +++ openstack_election/templates/tc_nominations_kickoff.j2 | 3 +++ openstack_election/templates/tc_nominations_last_days.j2 | 3 +++ openstack_election/templates/tc_voting_kickoff.j2 | 3 +++ openstack_election/templates/tc_voting_last_days.j2 | 3 +++ 16 files changed, 44 insertions(+), 2 deletions(-) diff --git a/doc/source/_exts/ptl_announce.jinja b/doc/source/_exts/ptl_announce.jinja index 79a64ef7..c7988733 100644 --- a/doc/source/_exts/ptl_announce.jinja +++ b/doc/source/_exts/ptl_announce.jinja @@ -1,4 +1,4 @@ -To: openstack-dev@lists.openstack.org, openstack-announce@lists.openstack.org +To: openstack-discuss@lists.openstack.org, openstack-announce@lists.openstack.org Subject: [all][elections] Project Team Lead Election Conclusion and Results Thank you to the electorate, to all those who voted and to all candidates who put their name forward for Project Team Lead (PTL) in this election. A healthy, open process breeds trust in our decision making capability thank you to all those who make this process possible. diff --git a/doc/source/_exts/tc_announce.jinja b/doc/source/_exts/tc_announce.jinja index eeb0ca42..2993e70f 100644 --- a/doc/source/_exts/tc_announce.jinja +++ b/doc/source/_exts/tc_announce.jinja @@ -1,4 +1,4 @@ -To: openstack-dev@lists.openstack.org, openstack-announce@lists.openstack.org +To: openstack-discuss@lists.openstack.org, openstack-announce@lists.openstack.org Subject: [all][elections] Technical Committee Election Results Please join me in congratulating the {{ tc_seats }} newly elected members of the Technical Committe (TC). diff --git a/openstack_election/templates/combined_election_season.j2 b/openstack_election/templates/combined_election_season.j2 index d70c12b1..96ac786a 100644 --- a/openstack_election/templates/combined_election_season.j2 +++ b/openstack_election/templates/combined_election_season.j2 @@ -1,3 +1,6 @@ +To: openstack-discuss@lists.openstack.org +Subject: [all][elections] Combined PTL/TC Election Season + Election details: https://governance.openstack.org/election/ Please read the stipulations and timelines for candidates and diff --git a/openstack_election/templates/ptl_election_season.j2 b/openstack_election/templates/ptl_election_season.j2 index 9980b250..9b2acd98 100644 --- a/openstack_election/templates/ptl_election_season.j2 +++ b/openstack_election/templates/ptl_election_season.j2 @@ -1,3 +1,6 @@ +To: openstack-discuss@lists.openstack.org +Subject: [all][elections] PTL Election Season + Election details: https://governance.openstack.org/election/ Please read the stipulations and timelines for candidates and diff --git a/openstack_election/templates/ptl_end_nominations.j2 b/openstack_election/templates/ptl_end_nominations.j2 index eefadc50..cac59fb3 100644 --- a/openstack_election/templates/ptl_end_nominations.j2 +++ b/openstack_election/templates/ptl_end_nominations.j2 @@ -1,3 +1,6 @@ +To: openstack-discuss@lists.openstack.org +Subject: [all][elections] PTL Nominations End + The PTL Nomination period is now over. The official candidate list is available on the election website[0]. diff --git a/openstack_election/templates/ptl_nominations_kickoff.j2 b/openstack_election/templates/ptl_nominations_kickoff.j2 index f728d664..c67e2c8c 100644 --- a/openstack_election/templates/ptl_nominations_kickoff.j2 +++ b/openstack_election/templates/ptl_nominations_kickoff.j2 @@ -1,3 +1,6 @@ +To: openstack-discuss@lists.openstack.org +Subject: [all][elections] PTL Nominations Kickoff + Nominations for OpenStack PTLs (Project Team Leads) are now open and will remain open until {{ end_nominations }}. diff --git a/openstack_election/templates/ptl_nominations_last_days.j2 b/openstack_election/templates/ptl_nominations_last_days.j2 index aa7929e8..99588530 100644 --- a/openstack_election/templates/ptl_nominations_last_days.j2 +++ b/openstack_election/templates/ptl_nominations_last_days.j2 @@ -1,3 +1,6 @@ +To: openstack-discuss@lists.openstack.org +Subject: [all][elections] PTL Nominations Last Days + A quick reminder that we are in the last hours for PTL candidate nominations. diff --git a/openstack_election/templates/ptl_voting_kickoff.j2 b/openstack_election/templates/ptl_voting_kickoff.j2 index 5324308e..2c9e0f79 100644 --- a/openstack_election/templates/ptl_voting_kickoff.j2 +++ b/openstack_election/templates/ptl_voting_kickoff.j2 @@ -1,3 +1,6 @@ +To: openstack-discuss@lists.openstack.org +Subject: [all][elections] PTL Voting Kickoff + Polls for PTL elections are now open and will remain open for you to cast your vote until {{ election_end }}. diff --git a/openstack_election/templates/ptl_voting_last_days.j2 b/openstack_election/templates/ptl_voting_last_days.j2 index ec55a67e..9aa9cf01 100644 --- a/openstack_election/templates/ptl_voting_last_days.j2 +++ b/openstack_election/templates/ptl_voting_last_days.j2 @@ -1,3 +1,6 @@ +To: openstack-discuss@lists.openstack.org +Subject: [all][elections] PTL Voting Last Days + Hello {{ list_of_elections }} contributors, Just a quick reminder that elections are closing soon, if you haven't diff --git a/openstack_election/templates/tc_campaigning_kickoff.j2 b/openstack_election/templates/tc_campaigning_kickoff.j2 index 6468a0a6..204a097c 100644 --- a/openstack_election/templates/tc_campaigning_kickoff.j2 +++ b/openstack_election/templates/tc_campaigning_kickoff.j2 @@ -1,3 +1,6 @@ +To: openstack-discuss@lists.openstack.org +Subject: [all][elections] TC Campaigning Kickoff + Developers, The TC Election Campaigning Period has now started [1]. During the next couple days, you are all encouraged to ask the candidates questions about diff --git a/openstack_election/templates/tc_election_season.j2 b/openstack_election/templates/tc_election_season.j2 index 0e0a31e2..0fffcff4 100644 --- a/openstack_election/templates/tc_election_season.j2 +++ b/openstack_election/templates/tc_election_season.j2 @@ -1,3 +1,6 @@ +To: openstack-discuss@lists.openstack.org +Subject: [all][elections] TC Election Season + Election details: https://governance.openstack.org/election/ Please read the stipulations and timelines for candidates and diff --git a/openstack_election/templates/tc_end_nominations.j2 b/openstack_election/templates/tc_end_nominations.j2 index 1fccee26..30ec1bd6 100644 --- a/openstack_election/templates/tc_end_nominations.j2 +++ b/openstack_election/templates/tc_end_nominations.j2 @@ -1,3 +1,6 @@ +To: openstack-discuss@lists.openstack.org +Subject: [all][elections] TC End Nominations + TC Nomination period is now over. The official candidate list is available on the election website[0]. diff --git a/openstack_election/templates/tc_nominations_kickoff.j2 b/openstack_election/templates/tc_nominations_kickoff.j2 index f8adb3cc..3b533d3a 100644 --- a/openstack_election/templates/tc_nominations_kickoff.j2 +++ b/openstack_election/templates/tc_nominations_kickoff.j2 @@ -1,3 +1,6 @@ +To: openstack-discuss@lists.openstack.org +Subject: [all][elections] TC Nominations Kickoff + Nominations for the Technical Committee positions ({{ seats }} positions) are now open and will remain open until {{ end_nominations }}. diff --git a/openstack_election/templates/tc_nominations_last_days.j2 b/openstack_election/templates/tc_nominations_last_days.j2 index 486072f5..117811a9 100644 --- a/openstack_election/templates/tc_nominations_last_days.j2 +++ b/openstack_election/templates/tc_nominations_last_days.j2 @@ -1,3 +1,6 @@ +To: openstack-discuss@lists.openstack.org +Subject: [all][elections] TC Nominations Last Days + A quick reminder that we are in the last hours for TC candidate announcements. Nominations are open until {{ end_nominations }}. diff --git a/openstack_election/templates/tc_voting_kickoff.j2 b/openstack_election/templates/tc_voting_kickoff.j2 index 991f5b76..967b72b5 100644 --- a/openstack_election/templates/tc_voting_kickoff.j2 +++ b/openstack_election/templates/tc_voting_kickoff.j2 @@ -1,3 +1,6 @@ +To: openstack-discuss@lists.openstack.org +Subject: [all][elections] TC Voting Kickoff + The poll for the TC Election is now open and will remain open until {{ election_end }}. diff --git a/openstack_election/templates/tc_voting_last_days.j2 b/openstack_election/templates/tc_voting_last_days.j2 index b551bc2b..e3ca84f1 100644 --- a/openstack_election/templates/tc_voting_last_days.j2 +++ b/openstack_election/templates/tc_voting_last_days.j2 @@ -1,3 +1,6 @@ +To: openstack-discuss@lists.openstack.org +Subject: [all][elections] TC Voting Last Days + We are coming down to the last hours for voting in the TC election. Voting ends {{ election_end }}.