From eac1e420f0a615297c18e4a95638367c961d8875 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Mon, 28 Feb 2022 19:01:16 +0100 Subject: [PATCH 1/3] Fix a s/as/has/ typo 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 aa7740c048fb..fbec95a1a44b 100644 --- a/warehouse/templates/email/basic-auth-with-2fa/body.html +++ b/warehouse/templates/email/basic-auth-with-2fa/body.html @@ -16,7 +16,7 @@ {% block content %}

{% 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 as two-factor authentication (2FA) enabled.{% 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 %} From 0f8a04ab71cefcbcd0af9be5caefbc8bd7c70675 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Mon, 28 Feb 2022 19:09:49 +0100 Subject: [PATCH 2/3] Fix s/as/has/ in the txt email template 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 c0ff3b66a6d3..6003f3e6897a 100644 --- a/warehouse/templates/email/basic-auth-with-2fa/body.txt +++ b/warehouse/templates/email/basic-auth-with-2fa/body.txt @@ -16,7 +16,7 @@ {% block content %} # {% 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 as two-factor authentication (2FA) enabled.{% 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 %} From 2250181765edd88b9c7c7703c8ffb3744819bbc3 Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Mon, 28 Feb 2022 13:16:08 -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 ef9b73aa5ca3..387113a4d471 100644 --- a/warehouse/locale/messages.pot +++ b/warehouse/locale/messages.pot @@ -1246,7 +1246,7 @@ msgstr "" msgid "" "During your recent upload or upload attempt to %(site)s, we noticed you " "used basic authentication (username & password). However, your " -"account as two-factor authentication (2FA) enabled." +"account has two-factor authentication (2FA) enabled." msgstr "" #: warehouse/templates/email/basic-auth-with-2fa/body.html:22