From 0ab77354cae01086896ea73bec0b073efe854708 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Mon, 28 Feb 2022 19:06:49 +0100 Subject: [PATCH 1/3] Deduplicate "instead" in `basic-auth-with-2fa` --- warehouse/templates/email/basic-auth-with-2fa/body.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warehouse/templates/email/basic-auth-with-2fa/body.html b/warehouse/templates/email/basic-auth-with-2fa/body.html index fbec95a1a44b..ef9b16e1f756 100644 --- a/warehouse/templates/email/basic-auth-with-2fa/body.html +++ b/warehouse/templates/email/basic-auth-with-2fa/body.html @@ -19,7 +19,7 @@

{% trans %}What?{% endtrans %}

{% trans site=request.registry.settings["site.name"] %}During your recent upload or upload attempt to {{ site }}, we noticed you used basic authentication (username & password). However, your account has two-factor authentication (2FA) enabled.{% endtrans %}

- {% trans site=request.registry.settings["site.name"] %}In the near future, {{ site }} will begin prohibiting uploads using basic authentication for accounts with two-factor authentication enabled. Instead, we will require API tokens to be used instead.{% endtrans %} + {% trans site=request.registry.settings["site.name"] %}In the near future, {{ site }} will begin prohibiting uploads using basic authentication for accounts with two-factor authentication enabled. Instead, we will require API tokens to be used.{% endtrans %}

{% trans %}What should I do?{% endtrans %}

From f908d00f0588781d1777df78664becf3515b75b1 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Mon, 28 Feb 2022 19:10:38 +0100 Subject: [PATCH 2/3] Drop the second "instead" from the txt email too --- warehouse/templates/email/basic-auth-with-2fa/body.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warehouse/templates/email/basic-auth-with-2fa/body.txt b/warehouse/templates/email/basic-auth-with-2fa/body.txt index 6003f3e6897a..0e9dc1c7c06a 100644 --- a/warehouse/templates/email/basic-auth-with-2fa/body.txt +++ b/warehouse/templates/email/basic-auth-with-2fa/body.txt @@ -18,7 +18,7 @@ {% trans site=request.registry.settings["site.name"] %}During your recent upload or upload attempt to {{ site }}, we noticed you used basic authentication (username & password). However, your account has two-factor authentication (2FA) enabled.{% endtrans %} -{% trans site=request.registry.settings["site.name"] %}In the near future, {{ site }} will begin prohibiting uploads using basic authentication for accounts with two-factor authentication enabled. Instead, we will require API tokens to be used instead.{% endtrans %} +{% trans site=request.registry.settings["site.name"] %}In the near future, {{ site }} will begin prohibiting uploads using basic authentication for accounts with two-factor authentication enabled. Instead, we will require API tokens to be used.{% endtrans %} # {% trans %}What should I do?{% endtrans %} From ea180ea633b1203cfe5099f555945d43edd53803 Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Mon, 28 Feb 2022 14:32:32 -0500 Subject: [PATCH 3/3] Update translations --- warehouse/locale/messages.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warehouse/locale/messages.pot b/warehouse/locale/messages.pot index 387113a4d471..6f417a8e7e34 100644 --- a/warehouse/locale/messages.pot +++ b/warehouse/locale/messages.pot @@ -1254,7 +1254,7 @@ msgstr "" msgid "" "In the near future, %(site)s will begin prohibiting uploads using basic " "authentication for accounts with two-factor authentication enabled. " -"Instead, we will require API tokens to be used instead." +"Instead, we will require API tokens to be used." msgstr "" #: warehouse/templates/email/basic-auth-with-2fa/body.html:25