Skip to content

Commit 8f064db

Browse files
committed
Fixed missed email template files for ActiveState publisher removal
1 parent 3635afa commit 8f064db

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

warehouse/templates/email/trusted-publisher-added/body.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@ users and can create project releases automatically.
3535
{%- if publisher.sub %}
3636
* {% trans %}Subject{% endtrans %}: {{ publisher.sub }}
3737
{%- endif %}
38-
{% if publisher.publisher_name == "ActiveState" %}
38+
{% elif publisher.publisher_name == "ActiveState" %}
3939
* {% trans %}Platform Project URL{% endtrans %}: {{ publisher.publisher_url }}
4040
* {% trans %}Organization{% endtrans %}: {{ publisher.organization }}
4141
* {% trans %}Project{% endtrans %}: {{ publisher.activestate_project_name }}
4242
* {% trans %}Actor{% endtrans %}: {{ publisher.actor }}
43-
{% endif %}
4443
{%- endif %}
4544

4645
{% trans %}

warehouse/templates/email/trusted-publisher-removed/body.html

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,22 @@
2727
<ul>
2828
<li>{% trans %}Publisher name{% endtrans %}: {{ publisher.publisher_name }}</li>
2929
{% if publisher.publisher_name == "GitHub" %}
30-
<li>{% trans %}Workflow{% endtrans %}: {{ publisher }}</li>
31-
<li>{% trans %}Owner{% endtrans %}: {{ publisher.repository_owner }}</li>
32-
<li>{% trans %}Repository{% endtrans %}: {{ publisher.repository_name }}</li>
33-
{% if publisher.environment %}
34-
<li>{% trans %}Environment{% endtrans %}: {{ publisher.environment }}</li>
35-
{% endif %}
30+
<li>{% trans %}Workflow{% endtrans %}: {{ publisher }}</li>
31+
<li>{% trans %}Owner{% endtrans %}: {{ publisher.repository_owner }}</li>
32+
<li>{% trans %}Repository{% endtrans %}: {{ publisher.repository_name }}</li>
33+
{% if publisher.environment %}
34+
<li>{% trans %}Environment{% endtrans %}: {{ publisher.environment }}</li>
35+
{% endif %}
3636
{% elif publisher.publisher_name == "Google" %}
37-
<li>{% trans %}Email{% endtrans %}: {{ publisher.email }}</li>
38-
{% if publisher.sub %}
39-
<li>{% trans %}Subject{% endtrans %}: {{ publisher.sub }}</li>
40-
{% endif %}
37+
<li>{% trans %}Email{% endtrans %}: {{ publisher.email }}</li>
38+
{% if publisher.sub %}
39+
<li>{% trans %}Subject{% endtrans %}: {{ publisher.sub }}</li>
40+
{% endif %}
41+
{% elif publisher.publisher_name == "ActiveState" %}
42+
<li>{% trans %}ActiveState Project URL{% endtrans %}: {{ publisher.publisher_url }}</li>
43+
<li>{% trans %}Organization{% endtrans %}: {{ publisher.organization }}</li>
44+
<li>{% trans %}ActiveState Project name{% endtrans %}: {{ publisher.activestate_project_name }}</li>
45+
<li>{% trans %}Actor{% endtrans %}: {{ publisher.actor }}</li>
4146
{% endif %}
4247
</ul>
4348
</p>

warehouse/templates/email/trusted-publisher-removed/body.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ PyPI user {{ username }} has removed a trusted publisher from a project
3434
{%- if publisher.sub %}
3535
* {% trans %}Subject{% endtrans %}: {{ publisher.sub }}
3636
{%- endif %}
37+
{% elif publisher.publisher_name == "ActiveState" %}
38+
* {% trans %}Platform Project URL{% endtrans %}: {{ publisher.publisher_url }}
39+
* {% trans %}Organization{% endtrans %}: {{ publisher.organization }}
40+
* {% trans %}Project{% endtrans %}: {{ publisher.activestate_project_name }}
41+
* {% trans %}Actor{% endtrans %}: {{ publisher.actor }}
3742
{%- endif %}
3843

3944
{% trans %}

0 commit comments

Comments
 (0)