This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 4a06a59 WHIMSY-327 Use PMC or PPMC in context of which type is being
emailed
4a06a59 is described below
commit 4a06a593d5c513d0a2970d0d45e4c37d7759334d
Author: Sebb <[email protected]>
AuthorDate: Fri Apr 24 12:46:52 2020 +0100
WHIMSY-327 Use PMC or PPMC in context of which type is being emailed
---
www/secretary/workbench/templates/icla-invalid-id.erb | 4 ++--
www/secretary/workbench/templates/icla-pmc-notified.erb | 4 ++--
www/secretary/workbench/templates/icla.erb | 2 +-
www/secretary/workbench/views/actions/icla.json.rb | 3 +++
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/www/secretary/workbench/templates/icla-invalid-id.erb
b/www/secretary/workbench/templates/icla-invalid-id.erb
index 2c931ad..ada922e 100644
--- a/www/secretary/workbench/templates/icla-invalid-id.erb
+++ b/www/secretary/workbench/templates/icla-invalid-id.erb
@@ -4,9 +4,9 @@ This message acknowledges receipt of your ICLA, which has been
filed in the Apac
With this message, <%= @notify %> been notified that your ICLA has been filed.
-** Please contact the (P)PMC with any further questions, not the Secretary.
Thanks. **
+** Please contact the <%= @cttee %> with any further questions, not the
Secretary. Thanks. **
-Please provide the (P)PMC (copied) with a valid Apache id.
+Please provide the <%= @cttee %> (copied) with a valid Apache id.
The id must not already be in use. See
https://people.apache.org/committer-index.html
Note that some existing ids include '-' and '_'. These characters are no
longer permitted in ids.
diff --git a/www/secretary/workbench/templates/icla-pmc-notified.erb
b/www/secretary/workbench/templates/icla-pmc-notified.erb
index 46882b3..f70d18f 100644
--- a/www/secretary/workbench/templates/icla-pmc-notified.erb
+++ b/www/secretary/workbench/templates/icla-pmc-notified.erb
@@ -4,9 +4,9 @@ This message acknowledges receipt of your ICLA, which has been
filed in the Apac
With this message, <%= @notify %> been notified that your ICLA has been filed.
-** Please contact the (P)PMC with any further questions, not the Secretary.
Thanks. **
+** Please contact the <%= @cttee %> with any further questions, not the
Secretary. Thanks. **
-If you have been invited as a committer, please provide the (P)PMC (copied)
with your preferred Apache id.
+If you have been invited as a committer, please provide the <%= @cttee %>
(copied) with your preferred Apache id.
The id must not already be in use. See
https://people.apache.org/committer-index.html
Note that some existing ids include '-' and '_'. These characters are no
longer permitted in ids.
diff --git a/www/secretary/workbench/templates/icla.erb
b/www/secretary/workbench/templates/icla.erb
index 2ec7566..2c7c852 100644
--- a/www/secretary/workbench/templates/icla.erb
+++ b/www/secretary/workbench/templates/icla.erb
@@ -2,7 +2,7 @@ Dear <%= @pubname %>,
This message acknowledges receipt of your ICLA, which has been filed in the
Apache Software Foundation records.
-If you have been invited as a committer, please advise the (P)PMC that your
ICLA has been filed.
+If you have been invited as a committer, please advise the <%= @cttee %> that
your ICLA has been filed.
If you have not been invited, please refer to
https://www.apache.org/foundation/how-it-works.html#developers for more
information about roles at Apache.
diff --git a/www/secretary/workbench/views/actions/icla.json.rb
b/www/secretary/workbench/views/actions/icla.json.rb
index 21424ab..568654a 100644
--- a/www/secretary/workbench/views/actions/icla.json.rb
+++ b/www/secretary/workbench/views/actions/icla.json.rb
@@ -153,6 +153,9 @@ task "email #@email" do
reply = 'icla.erb'
end
+ @cttee = '(P)PMC'
+ @cttee = "Apache #{@podling.display_name} podling" if @podling
+ @cttee = "Apache #{@pmc.display_name} PMC" if @pmc
# build mail from template
mail = message.reply(
subject: "ICLA for #{@pubname}",
