emails: Polish template content for better readability and consistency

Turbo87 · Turbo87 · commit 18f5c83f5b31 · 2025-07-01T14:39:29.000+02:00
diff --git a/src/controllers/trustpub/github_configs/create/snapshots/crates_io__controllers__trustpub__github_configs__create__tests__happy_path-3.snap b/src/controllers/trustpub/github_configs/create/snapshots/crates_io__controllers__trustpub__github_configs__create__tests__happy_path-3.snap
@@ -10,7 +10,7 @@ Content-Transfer-Encoding: quoted-printable
 
 Hello foo!
 
-crates.io user foo added a new "Trusted Publishing" configuration for GitHub Actions to a crate that you manage (foo). Trusted publishers act as trusted users and can publish new versions of the crate automatically.
+crates.io user foo added a new "Trusted Publishing" configuration for GitHub Actions to a crate that you manage ("foo"). Trusted publishers act as trusted users and can publish new versions of the crate automatically.
 
 Trusted Publishing configuration:
 
@@ -21,4 +21,4 @@ Trusted Publishing configuration:
 
 If you did not make this change and you think it was made maliciously, you can remove the configuration from the crate via the "Settings" tab on the crate's page.
 
-If you are unable to revert the change and need to do so, you can email help@crates.io to communicate with the crates.io support team.
+If you are unable to revert the change and need to do so, you can email help@crates.io for assistance.
diff --git a/src/controllers/trustpub/github_configs/delete/snapshots/crates_io__controllers__trustpub__github_configs__delete__tests__happy_path-2.snap b/src/controllers/trustpub/github_configs/delete/snapshots/crates_io__controllers__trustpub__github_configs__delete__tests__happy_path-2.snap
@@ -10,7 +10,7 @@ Content-Transfer-Encoding: quoted-printable
 
 Hello foo!
 
-crates.io user foo removed a "Trusted Publishing" configuration for GitHub Actions from a crate that you manage (foo).
+crates.io user foo removed a "Trusted Publishing" configuration for GitHub Actions from a crate that you manage ("foo").
 
 Trusted Publishing configuration:
 
@@ -19,4 +19,4 @@ Trusted Publishing configuration:
 - Workflow filename: publish.yml
 - Environment: (not set)
 
-If you did not make this change and you think it was made maliciously, you can email help@crates.io to communicate with the crates.io support team.
+If you did not make this change and you think it was made maliciously, you can email help@crates.io for assistance.
diff --git a/src/controllers/user/snapshots/crates_io__controllers__user__email_verification__tests__happy_path-3.snap b/src/controllers/user/snapshots/crates_io__controllers__user__email_verification__tests__happy_path-3.snap
@@ -6,9 +6,12 @@ To: foo@example.com
 From: crates.io <noreply@crates.io>
 Subject: crates.io: Please confirm your email address
 Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 7bit
+Content-Transfer-Encoding: quoted-printable
 
-Hello foo! Welcome to crates.io. Please click the
-link below to verify your email address. Thank you!
+Hello foo!
+
+Welcome to crates.io. Please click the link below to verify your email address:
 
 https://crates.io/confirm/[confirm-token]
+
+Thank you!
diff --git a/src/email/templates/config_created/body.txt.j2 b/src/email/templates/config_created/body.txt.j2
@@ -1,6 +1,6 @@
 Hello {{ recipient }}!
 
-crates.io user {{ user }} added a new "Trusted Publishing" configuration for GitHub Actions to a crate that you manage ({{ krate }}). Trusted publishers act as trusted users and can publish new versions of the crate automatically.
+crates.io user {{ user }} added a new "Trusted Publishing" configuration for GitHub Actions to a crate that you manage ("{{ krate }}"). Trusted publishers act as trusted users and can publish new versions of the crate automatically.
 
 Trusted Publishing configuration:
 
@@ -11,4 +11,4 @@ Trusted Publishing configuration:
 
 If you did not make this change and you think it was made maliciously, you can remove the configuration from the crate via the "Settings" tab on the crate's page.
 
-If you are unable to revert the change and need to do so, you can email help@crates.io to communicate with the crates.io support team.
+If you are unable to revert the change and need to do so, you can email help@crates.io for assistance.
diff --git a/src/email/templates/config_deleted/body.txt.j2 b/src/email/templates/config_deleted/body.txt.j2
@@ -1,6 +1,6 @@
 Hello {{ recipient }}!
 
-crates.io user {{ user }} removed a "Trusted Publishing" configuration for GitHub Actions from a crate that you manage ({{ krate }}).
+crates.io user {{ user }} removed a "Trusted Publishing" configuration for GitHub Actions from a crate that you manage ("{{ krate }}").
 
 Trusted Publishing configuration:
 
@@ -9,4 +9,4 @@ Trusted Publishing configuration:
 - Workflow filename: {{ workflow_filename }}
 - Environment: {{ environment or "(not set)" }}
 
-If you did not make this change and you think it was made maliciously, you can email help@crates.io to communicate with the crates.io support team.
+If you did not make this change and you think it was made maliciously, you can email help@crates.io for assistance.
diff --git a/src/email/templates/expiry_notification/body.txt.j2 b/src/email/templates/expiry_notification/body.txt.j2
@@ -1,6 +1,6 @@
 Hi {{ name }},
 
-We noticed your token "{{ token_name }}" will expire on {{ expiry_date }}.
+We noticed that your token "{{ token_name }}" will expire on {{ expiry_date }}.
 
 If this token is still needed, visit https://crates.io/settings/tokens/new?from={{ token_id }} to generate a new one.
 
diff --git a/src/email/templates/new_token/body.txt.j2 b/src/email/templates/new_token/body.txt.j2
@@ -2,4 +2,4 @@ Hello {{ user_name }}!
 
 A new API token with the name "{{ token_name }}" was recently added to your {{ domain }} account.
 
-If this wasn't you, you should revoke the token immediately: https://{{ domain }}/settings/tokens
+If you did not create this token, you should revoke it immediately: https://{{ domain }}/settings/tokens.
diff --git a/src/email/templates/owner_invite/body.txt.j2 b/src/email/templates/owner_invite/body.txt.j2
@@ -1,4 +1,5 @@
 {{ inviter }} has invited you to become an owner of the crate {{ crate_name }}!
 
-Visit https://{{ domain }}/accept-invite/{{ token }} to accept this invitation,
-or go to https://{{ domain }}/me/pending-invites to manage all of your crate ownership invitations.
+Visit https://{{ domain }}/accept-invite/{{ token }} to accept this invitation.
+
+You can also go to https://{{ domain }}/me/pending-invites to manage all of your crate ownership invitations.
diff --git a/src/email/templates/token_exposed/body.txt.j2 b/src/email/templates/token_exposed/body.txt.j2
@@ -7,5 +7,5 @@ Source type: {{ source }}
 {% if url -%}
 URL where the token was found: {{ url }}
 {%- else -%}
-We were not informed of the URL where the token was found.
+We were not provided with the URL where the token was found.
 {%- endif %}
diff --git a/src/email/templates/trustpub_token_exposed/body.txt.j2 b/src/email/templates/trustpub_token_exposed/body.txt.j2
@@ -13,7 +13,7 @@ Source type: {{ source }}
 {% if url -%}
 URL where the token was found: {{ url }}
 {%- else -%}
-We were not informed of the URL where the token was found.
+We were not provided with the URL where the token was found.
 {%- endif %}
 
 Trusted Publishing tokens are temporary and used for automated publishing from GitHub Actions. If this exposure was unexpected, please review your repository's workflow files and secrets.
diff --git a/src/email/templates/unsubscribe_notifications/body.txt.j2 b/src/email/templates/unsubscribe_notifications/body.txt.j2
@@ -2,4 +2,4 @@ Hello {{ user_name }}!
 
 You have been unsubscribed from publish notifications.
 
-If you would like to resubscribe, please visit https://{{ domain }}/settings/profile
+If you would like to resubscribe, please visit https://{{ domain }}/settings/profile.
diff --git a/src/email/templates/user_confirm/body.txt.j2 b/src/email/templates/user_confirm/body.txt.j2
@@ -1,4 +1,7 @@
-Hello {{ user_name }}! Welcome to crates.io. Please click the
-link below to verify your email address. Thank you!
+Hello {{ user_name }}!
 
-https://{{ domain }}/confirm/{{ token }}
+Welcome to crates.io. Please click the link below to verify your email address:
+
+https://{{ domain }}/confirm/{{ token }}
+
+Thank you!
diff --git a/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__trustpub__full_flow-11.snap b/src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__trustpub__full_flow-11.snap
@@ -23,7 +23,7 @@ Content-Transfer-Encoding: quoted-printable
 
 Hello foo!
 
-crates.io user foo added a new "Trusted Publishing" configuration for GitHub Actions to a crate that you manage (foo). Trusted publishers act as trusted users and can publish new versions of the crate automatically.
+crates.io user foo added a new "Trusted Publishing" configuration for GitHub Actions to a crate that you manage ("foo"). Trusted publishers act as trusted users and can publish new versions of the crate automatically.
 
 Trusted Publishing configuration:
 
@@ -34,7 +34,7 @@ Trusted Publishing configuration:
 
 If you did not make this change and you think it was made maliciously, you can remove the configuration from the crate via the "Settings" tab on the crate's page.
 
-If you are unable to revert the change and need to do so, you can email help@crates.io to communicate with the crates.io support team.
+If you are unable to revert the change and need to do so, you can email help@crates.io for assistance.
 ----------------------------------------
 
 To: foo@example.com
diff --git a/src/tests/routes/me/tokens/snapshots/crates_io__tests__routes__me__tokens__create__create_token_success-3.snap b/src/tests/routes/me/tokens/snapshots/crates_io__tests__routes__me__tokens__create__create_token_success-3.snap
@@ -12,4 +12,4 @@ Hello foo!
 
 A new API token with the name "bar" was recently added to your crates.io account.
 
-If this wasn't you, you should revoke the token immediately: https://crates.io/settings/tokens
+If you did not create this token, you should revoke it immediately: https://crates.io/settings/tokens.
diff --git a/src/tests/routes/me/tokens/snapshots/crates_io__tests__routes__me__tokens__create__create_token_with_expiry_date-3.snap b/src/tests/routes/me/tokens/snapshots/crates_io__tests__routes__me__tokens__create__create_token_with_expiry_date-3.snap
@@ -12,4 +12,4 @@ Hello foo!
 
 A new API token with the name "bar" was recently added to your crates.io account.
 
-If this wasn't you, you should revoke the token immediately: https://crates.io/settings/tokens
+If you did not create this token, you should revoke it immediately: https://crates.io/settings/tokens.
diff --git a/src/tests/routes/me/tokens/snapshots/crates_io__tests__routes__me__tokens__create__create_token_with_null_scopes-3.snap b/src/tests/routes/me/tokens/snapshots/crates_io__tests__routes__me__tokens__create__create_token_with_null_scopes-3.snap
@@ -12,4 +12,4 @@ Hello foo!
 
 A new API token with the name "bar" was recently added to your crates.io account.
 
-If this wasn't you, you should revoke the token immediately: https://crates.io/settings/tokens
+If you did not create this token, you should revoke it immediately: https://crates.io/settings/tokens.
diff --git a/src/tests/routes/me/tokens/snapshots/crates_io__tests__routes__me__tokens__create__create_token_with_scopes-3.snap b/src/tests/routes/me/tokens/snapshots/crates_io__tests__routes__me__tokens__create__create_token_with_scopes-3.snap
@@ -12,4 +12,4 @@ Hello foo!
 
 A new API token with the name "bar" was recently added to your crates.io account.
 
-If this wasn't you, you should revoke the token immediately: https://crates.io/settings/tokens
+If you did not create this token, you should revoke it immediately: https://crates.io/settings/tokens.
diff --git a/src/tests/routes/users/update/snapshots/crates_io__tests__routes__users__update__publish_notifications__unsubscribe_and_resubscribe-11.snap b/src/tests/routes/users/update/snapshots/crates_io__tests__routes__users__update__publish_notifications__unsubscribe_and_resubscribe-11.snap
@@ -25,7 +25,7 @@ Hello foo!
 
 You have been unsubscribed from publish notifications.
 
-If you would like to resubscribe, please visit https://crates.io/settings/profile
+If you would like to resubscribe, please visit https://crates.io/settings/profile.
 ----------------------------------------
 
 To: foo@example.com
diff --git a/src/tests/routes/users/update/snapshots/crates_io__tests__routes__users__update__publish_notifications__unsubscribe_and_resubscribe-5.snap b/src/tests/routes/users/update/snapshots/crates_io__tests__routes__users__update__publish_notifications__unsubscribe_and_resubscribe-5.snap
@@ -25,4 +25,4 @@ Hello foo!
 
 You have been unsubscribed from publish notifications.
 
-If you would like to resubscribe, please visit https://crates.io/settings/profile
+If you would like to resubscribe, please visit https://crates.io/settings/profile.
diff --git a/src/tests/routes/users/update/snapshots/crates_io__tests__routes__users__update__publish_notifications__unsubscribe_and_resubscribe-7.snap b/src/tests/routes/users/update/snapshots/crates_io__tests__routes__users__update__publish_notifications__unsubscribe_and_resubscribe-7.snap
@@ -25,4 +25,4 @@ Hello foo!
 
 You have been unsubscribed from publish notifications.
 
-If you would like to resubscribe, please visit https://crates.io/settings/profile
+If you would like to resubscribe, please visit https://crates.io/settings/profile.
diff --git a/src/tests/snapshots/crates_io__tests__owners__modify_multiple_owners-10.snap b/src/tests/snapshots/crates_io__tests__owners__modify_multiple_owners-10.snap
@@ -10,8 +10,9 @@ Content-Transfer-Encoding: quoted-printable
 
 foo has invited you to become an owner of the crate owners_multiple!
 
-Visit https://crates.io/accept-invite/[invite-token] to accept this invitation,
-or go to https://crates.io/me/pending-invites to manage all of your crate ownership invitations.
+Visit https://crates.io/accept-invite/[invite-token] to accept this invitation.
+
+You can also go to https://crates.io/me/pending-invites to manage all of your crate ownership invitations.
 ----------------------------------------
 
 To: user3@example.com
@@ -22,8 +23,9 @@ Content-Transfer-Encoding: quoted-printable
 
 foo has invited you to become an owner of the crate owners_multiple!
 
-Visit https://crates.io/accept-invite/[invite-token] to accept this invitation,
-or go to https://crates.io/me/pending-invites to manage all of your crate ownership invitations.
+Visit https://crates.io/accept-invite/[invite-token] to accept this invitation.
+
+You can also go to https://crates.io/me/pending-invites to manage all of your crate ownership invitations.
 ----------------------------------------
 
 To: user2@example.com
@@ -34,8 +36,9 @@ Content-Transfer-Encoding: quoted-printable
 
 foo has invited you to become an owner of the crate owners_multiple!
 
-Visit https://crates.io/accept-invite/[invite-token] to accept this invitation,
-or go to https://crates.io/me/pending-invites to manage all of your crate ownership invitations.
+Visit https://crates.io/accept-invite/[invite-token] to accept this invitation.
+
+You can also go to https://crates.io/me/pending-invites to manage all of your crate ownership invitations.
 ----------------------------------------
 
 To: user3@example.com
@@ -46,5 +49,6 @@ Content-Transfer-Encoding: quoted-printable
 
 foo has invited you to become an owner of the crate owners_multiple!
 
-Visit https://crates.io/accept-invite/[invite-token] to accept this invitation,
-or go to https://crates.io/me/pending-invites to manage all of your crate ownership invitations.
+Visit https://crates.io/accept-invite/[invite-token] to accept this invitation.
+
+You can also go to https://crates.io/me/pending-invites to manage all of your crate ownership invitations.
diff --git a/src/tests/snapshots/crates_io__tests__owners__modify_multiple_owners.snap b/src/tests/snapshots/crates_io__tests__owners__modify_multiple_owners.snap
@@ -10,8 +10,9 @@ Content-Transfer-Encoding: quoted-printable
 
 foo has invited you to become an owner of the crate owners_multiple!
 
-Visit https://crates.io/accept-invite/[invite-token] to accept this invitation,
-or go to https://crates.io/me/pending-invites to manage all of your crate ownership invitations.
+Visit https://crates.io/accept-invite/[invite-token] to accept this invitation.
+
+You can also go to https://crates.io/me/pending-invites to manage all of your crate ownership invitations.
 ----------------------------------------
 
 To: user3@example.com
@@ -22,5 +23,6 @@ Content-Transfer-Encoding: quoted-printable
 
 foo has invited you to become an owner of the crate owners_multiple!
 
-Visit https://crates.io/accept-invite/[invite-token] to accept this invitation,
-or go to https://crates.io/me/pending-invites to manage all of your crate ownership invitations.
+Visit https://crates.io/accept-invite/[invite-token] to accept this invitation.
+
+You can also go to https://crates.io/me/pending-invites to manage all of your crate ownership invitations.
diff --git a/src/tests/snapshots/crates_io__tests__owners__new_crate_owner-2.snap b/src/tests/snapshots/crates_io__tests__owners__new_crate_owner-2.snap
@@ -23,8 +23,9 @@ Content-Transfer-Encoding: quoted-printable
 
 foo has invited you to become an owner of the crate foo_owner!
 
-Visit https://crates.io/accept-invite/[invite-token] to accept this invitation,
-or go to https://crates.io/me/pending-invites to manage all of your crate ownership invitations.
+Visit https://crates.io/accept-invite/[invite-token] to accept this invitation.
+
+You can also go to https://crates.io/me/pending-invites to manage all of your crate ownership invitations.
 ----------------------------------------
 
 To: foo@example.com
diff --git a/src/tests/snapshots/crates_io__tests__owners__new_crate_owner.snap b/src/tests/snapshots/crates_io__tests__owners__new_crate_owner.snap
@@ -23,5 +23,6 @@ Content-Transfer-Encoding: quoted-printable
 
 foo has invited you to become an owner of the crate foo_owner!
 
-Visit https://crates.io/accept-invite/[invite-token] to accept this invitation,
-or go to https://crates.io/me/pending-invites to manage all of your crate ownership invitations.
+Visit https://crates.io/accept-invite/[invite-token] to accept this invitation.
+
+You can also go to https://crates.io/me/pending-invites to manage all of your crate ownership invitations.

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ Hello {{ user_name }}!`
`2`	`2`
`3`	`3`	`A new API token with the name "{{ token_name }}" was recently added to your {{ domain }} account.`
`4`	`4`
`5`		`-If this wasn't you, you should revoke the token immediately: https://{{ domain }}/settings/tokens`
	`5`	`+If you did not create this token, you should revoke it immediately: https://{{ domain }}/settings/tokens.`