Skip to content

Fix a s/as/has/ typo in basic-auth-with-2fa #10843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 28, 2022
Merged

Fix a s/as/has/ typo in basic-auth-with-2fa #10843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eac1e42
Fix a s/as/has/ typo in `basic-auth-with-2fa`
webknjaz Feb 28, 2022
0f8a04a
Fix s/as/has/ in the txt email template too
webknjaz Feb 28, 2022
2250181
Update translations
di Feb 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion warehouse/locale/messages.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion warehouse/templates/email/basic-auth-with-2fa/body.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{% block content %}
<h3>{% trans %}What?{% endtrans %}</h3>
<p>
{% trans site=request.registry.settings["site.name"] %}During your recent upload or upload attempt to {{ site }}, we noticed you used basic authentication (username &amp; 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 &amp; password). However, your account has two-factor authentication (2FA) enabled.{% endtrans %}
</p>
<p>
{% 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 %}
Expand Down
2 changes: 1 addition & 1 deletion warehouse/templates/email/basic-auth-with-2fa/body.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down