Skip to content

Deduplicate "instead" in basic-auth-with-2fa #10844

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

Deduplicate "instead" in basic-auth-with-2fa #10844

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
0ab7735
Deduplicate "instead" in `basic-auth-with-2fa`
webknjaz Feb 28, 2022
f908d00
Drop the second "instead" from the txt email too
webknjaz Feb 28, 2022
ea180ea
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 @@ -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
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 @@ -19,7 +19,7 @@ <h3>{% trans %}What?{% endtrans %}</h3>
{% 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 %}
{% 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 %}
</p>

<h3>{% trans %}What should I do?{% endtrans %}</h3>
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 @@ -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 %}

Expand Down