Removed site name from email subject and body - Addressed code reviews

waseem18 · waseem18 · commit c8796ede7b0f · 2018-05-08T20:06:23.000+05:30
diff --git a/warehouse/templates/email/added-as-collaborator.body.txt b/warehouse/templates/email/added-as-collaborator.body.txt
@@ -1,4 +1,4 @@
-You have been added as a collaborator to the PyPI project {{ project }}
+You have been added as a collaborator to the project {{ project }}
 by {{ submitter }}.
 
 {% if role == 'Owner' -%}
diff --git a/warehouse/templates/email/collaborator-added.body.txt b/warehouse/templates/email/collaborator-added.body.txt
@@ -1,4 +1,4 @@
-A new collaborator has been added to a project you own on PyPI:
+A new collaborator has been added to a project you own:
 
   Username: {{ username }}
   Role: {{ role }}
diff --git a/warehouse/templates/email/role-changed-for-user.body.txt b/warehouse/templates/email/role-changed-for-user.body.txt
@@ -1,9 +1,9 @@
-A collaborator's role has been changed in a project you own on PyPI:
+A collaborator's role has been changed in a project you own:
 
   Username: {{ username }}
   New role: {{ role }}
   Collaborator for: {{ project }}
   Changed by: {{ submitter }}
 
-If this was a mistake, you can reply to this email directly to communicate with
+If this was a mistake, you can email admin@mail.pypi.org to communicate with
 the PyPI administrators.
diff --git a/warehouse/templates/email/role-changed-for-user.subject.txt b/warehouse/templates/email/role-changed-for-user.subject.txt
@@ -1 +1 @@
-Role changed on PyPI for project {{ project }}
+Role changed for project {{ project }}
diff --git a/warehouse/templates/email/role-removed-from-user.body.txt b/warehouse/templates/email/role-removed-from-user.body.txt
@@ -1,9 +1,9 @@
-A collaborator's role has been removed from a project you own on PyPI:
+A collaborator's role has been removed from a project you own:
 
   Username: {{ username }}
   Role was previously: {{ role }}
   Collaborator for: {{ project }}
   Changed by: {{ submitter }}
 
-If this was a mistake, you can reply to this email directly to communicate with
+If this was a mistake, you can email admin@mail.pypi.org to communicate with
 the PyPI administrators.
diff --git a/warehouse/templates/email/role-removed-from-user.subject.txt b/warehouse/templates/email/role-removed-from-user.subject.txt
@@ -1 +1 @@
-Role removed on PyPI for project {{ project }}
+Role removed for project {{ project }}
diff --git a/warehouse/templates/email/user-role-changed.body.txt b/warehouse/templates/email/user-role-changed.body.txt
@@ -1,16 +1,14 @@
 Your role in the {{ project }} project has been changed by {{ submitter }}.
 
-{% if role == 'Owner' %}
+{% if role == 'Owner' -%}
 You are now a project owner. This means that you may add other collaborators,
 upload releases for the project, delete files and releases, or delete the entire
 project.
-{% endif %}
-
-{% if role == 'Maintainer' %}
+{%- elif role == 'Maintainer' -%}
 You are now a project maintainer. This means that you may upload releases for
 the project. You cannot add collaborators, delete files, delete releases, or
 delete the project.
-{% endif %}
+{%- endif %}
 
-If this was a mistake, you can reply to this email directly to communicate with
+If this was a mistake, you can email admin@mail.pypi.org to communicate with
 the PyPI administrators.
diff --git a/warehouse/templates/email/user-role-changed.subject.txt b/warehouse/templates/email/user-role-changed.subject.txt
@@ -1 +1 @@
-Role changed on PyPI for project {{ project }}
+Role changed for project {{ project }}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-You have been added as a collaborator to the PyPI project {{ project }}`
	`1`	`+You have been added as a collaborator to the project {{ project }}`
`2`	`2`	`by {{ submitter }}.`
`3`	`3`
`4`	`4`	`{% if role == 'Owner' -%}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-A new collaborator has been added to a project you own on PyPI:`
	`1`	`+A new collaborator has been added to a project you own:`
`2`	`2`
`3`	`3`	`Username: {{ username }}`
`4`	`4`	`Role: {{ role }}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Role changed on PyPI for project {{ project }}`
	`1`	`+Role changed for project {{ project }}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Role removed on PyPI for project {{ project }}`
	`1`	`+Role removed for project {{ project }}`