trusted publishing: repo owner in emails (#13753)

* trusted publishing: repo owner in emails

Signed-off-by: William Woodruff <[email protected]>

* `make translations`

Signed-off-by: William Woodruff <[email protected]>

---------

Signed-off-by: William Woodruff <[email protected]>

Author: woodruffw

tests/unit/email/test_init.py

@@ -5800,6 +5800,7 @@ def test_trusted_publisher_emails(
         project_name = "test_project"
         fakepublisher = pretend.stub(
             publisher_name="fakepublisher",
+            repository_owner="fakeowner",
             repository_name="fakerepository",
             environment="fakeenvironment",
         )
@@ -5820,7 +5821,8 @@ def test_trusted_publisher_emails(
             "project_name": project_name,
             "publisher_name": "fakepublisher",
             "publisher_workflow": "fakespecifier",
-            "publisher_repository": "fakerepository",
+            "publisher_repository_owner": "fakeowner",
+            "publisher_repository_name": "fakerepository",
             "publisher_environment": "fakeenvironment",
         }
         subject_renderer.assert_()

warehouse/email/__init__.py

@@ -994,7 +994,8 @@ def send_trusted_publisher_added_email(request, user, project_name, publisher):
         "project_name": project_name,
         "publisher_name": publisher.publisher_name,
         "publisher_workflow": str(publisher),
-        "publisher_repository": publisher.repository_name,
+        "publisher_repository_owner": publisher.repository_owner,
+        "publisher_repository_name": publisher.repository_name,
         "publisher_environment": publisher.environment,
     }
 
@@ -1007,7 +1008,8 @@ def send_trusted_publisher_removed_email(request, user, project_name, publisher)
         "project_name": project_name,
         "publisher_name": publisher.publisher_name,
         "publisher_workflow": str(publisher),
-        "publisher_repository": publisher.repository_name,
+        "publisher_repository_owner": publisher.repository_owner,
+        "publisher_repository_name": publisher.repository_name,
         "publisher_environment": publisher.environment,
     }
 

warehouse/locale/messages.pot

@@ -2370,25 +2370,42 @@ msgstr ""
 
 #: warehouse/templates/email/trusted-publisher-added/body.html:32
 #: warehouse/templates/email/trusted-publisher-removed/body.html:30
+#: warehouse/templates/includes/packaging/project-data.html:117
+#: warehouse/templates/manage/account/publishing.html:139
+#: warehouse/templates/manage/organization/roles.html:53
+#: warehouse/templates/manage/organization/roles.html:172
+#: warehouse/templates/manage/organizations.html:89
+#: warehouse/templates/manage/project/publishing.html:76
+#: warehouse/templates/manage/project/roles.html:50
+#: warehouse/templates/manage/project/roles.html:85
+#: warehouse/templates/manage/project/roles.html:115
+#: warehouse/templates/manage/project/roles.html:127
+#: warehouse/templates/manage/project/roles.html:172
+#: warehouse/templates/manage/project/roles.html:184
+msgid "Owner"
+msgstr ""
+
+#: warehouse/templates/email/trusted-publisher-added/body.html:33
+#: warehouse/templates/email/trusted-publisher-removed/body.html:31
 #: warehouse/templates/manage/account/publishing.html:76
 #: warehouse/templates/manage/project/publishing.html:45
 msgid "Repository"
 msgstr ""
 
-#: warehouse/templates/email/trusted-publisher-added/body.html:34
-#: warehouse/templates/email/trusted-publisher-removed/body.html:32
+#: warehouse/templates/email/trusted-publisher-added/body.html:35
+#: warehouse/templates/email/trusted-publisher-removed/body.html:33
 msgid "Environment"
 msgstr ""
 
-#: warehouse/templates/email/trusted-publisher-added/body.html:40
+#: warehouse/templates/email/trusted-publisher-added/body.html:41
 msgid ""
 "If you did not make this change and you think it was made maliciously, "
 "you can remove it from the project via the \"Publishing\" tab on the "
 "project's page."
 msgstr ""
 
-#: warehouse/templates/email/trusted-publisher-added/body.html:47
-#: warehouse/templates/email/trusted-publisher-removed/body.html:45
+#: warehouse/templates/email/trusted-publisher-added/body.html:48
+#: warehouse/templates/email/trusted-publisher-removed/body.html:46
 #, python-format
 msgid ""
 "If you are unable to revert the change and need to do so, you can email "
@@ -2403,7 +2420,7 @@ msgid ""
 "from a project (<strong>%(project_name)s</strong>) that you manage."
 msgstr ""
 
-#: warehouse/templates/email/trusted-publisher-removed/body.html:38
+#: warehouse/templates/email/trusted-publisher-removed/body.html:39
 msgid ""
 "If you did not make this change and you think it was made in error, you "
 "can check the \"Security history\" tab on the project's page."
@@ -2784,21 +2801,6 @@ msgstr ""
 msgid "Requires:"
 msgstr ""
 
-#: warehouse/templates/includes/packaging/project-data.html:117
-#: warehouse/templates/manage/account/publishing.html:139
-#: warehouse/templates/manage/organization/roles.html:53
-#: warehouse/templates/manage/organization/roles.html:172
-#: warehouse/templates/manage/organizations.html:89
-#: warehouse/templates/manage/project/publishing.html:76
-#: warehouse/templates/manage/project/roles.html:50
-#: warehouse/templates/manage/project/roles.html:85
-#: warehouse/templates/manage/project/roles.html:115
-#: warehouse/templates/manage/project/roles.html:127
-#: warehouse/templates/manage/project/roles.html:172
-#: warehouse/templates/manage/project/roles.html:184
-msgid "Owner"
-msgstr ""
-
 #: warehouse/templates/includes/packaging/project-data.html:130
 msgid "Maintainers"
 msgstr ""

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

@@ -29,7 +29,8 @@
   <ul>
     <li>{% trans %}Publisher name{% endtrans %}: {{ publisher_name }}</li>
     <li>{% trans %}Workflow{% endtrans %}: {{ publisher_workflow }}</li>
-    <li>{% trans %}Repository{% endtrans %}: {{ publisher_repository }}</li>
+    <li>{% trans %}Owner{% endtrans %}: {{ publisher_repository_owner }}</li>
+    <li>{% trans %}Repository{% endtrans %}: {{ publisher_repository_name }}</li>
     {% if publisher_environment %}
     <li>{% trans %}Environment{% endtrans %}: {{ publisher_environment }}</li>
     {% endif %}

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

@@ -24,7 +24,8 @@ users and can create project releases automatically.
 
 * {% trans %}Publisher{% endtrans %}: {{ publisher_name }}
 * {% trans %}Workflow{% endtrans %}: {{ publisher_workflow }}
-* {% trans %}Repository{% endtrans %}: {{ publisher_repository }}
+* {% trans %}Owner{% endtrans %}: {{ publisher_repository_owner }}
+* {% trans %}Repository{% endtrans %}: {{ publisher_repository_name }}
 {%- if publisher_environment %}
 * {% trans %}Environment{% endtrans %}: {{ publisher_environment }}
 {%- endif %}

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

@@ -27,7 +27,8 @@
   <ul>
     <li>{% trans %}Publisher name{% endtrans %}: {{ publisher_name }}</li>
     <li>{% trans %}Workflow{% endtrans %}: {{ publisher_workflow }}</li>
-    <li>{% trans %}Repository{% endtrans %}: {{ publisher_repository }}</li>
+    <li>{% trans %}Owner{% endtrans %}: {{ publisher_repository_owner }}</li>
+    <li>{% trans %}Repository{% endtrans %}: {{ publisher_repository_name }}</li>
     {% if publisher_environment %}
     <li>{% trans %}Environment{% endtrans %}: {{ publisher_environment }}</li>
     {% endif %}

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

@@ -23,7 +23,8 @@ PyPI user {{ username }} has removed a trusted publisher from a project
 
 * {% trans %}Publisher{% endtrans %}: {{ publisher_name }}
 * {% trans %}Workflow{% endtrans %}: {{ publisher_workflow }}
-* {% trans %}Repository{% endtrans %}: {{ publisher_repository }}
+* {% trans %}Owner{% endtrans %}: {{ publisher_repository_owner }}
+* {% trans %}Repository{% endtrans %}: {{ publisher_repository_name }}
 {%- if publisher_environment %}
 * {% trans %}Environment{% endtrans %}: {{ publisher_environment }}
 {% endif %}