globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

doc: prefer 'multi-factor' over 'two-factor' term

Browse source
This commit is contained in:
Éloi Rivard 2024-12-12 12:03:32 +01:00
parent b336e01938
commit 44c5669d97
No known key found for this signature in database
GPG key ID: 7EDA204EA57DD184
6 changed files with 1417 additions and 1415 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
canaille/core/endpoints/auth.py
View file

@ -469,7 +469,7 @@ def redirect_to_verify_2fa(user, otp_method, request_ip, fail_redirect_url):
if otp_method in ["HOTP", "TOTP"]: if otp_method in ["HOTP", "TOTP"]:
if not user.last_otp_login: if not user.last_otp_login:
flash( flash(
"You have not enabled Two-Factor Authentication. Please enable it first to login.", "You have not enabled multi-factor authentication. Please enable it first to login.",
"info", "info",
) )
return redirect(url_for("core.auth.setup_two_factor_auth")) return redirect(url_for("core.auth.setup_two_factor_auth"))

6
canaille/core/models.py
View file

@ -255,14 +255,14 @@ class User(Model):
secret_token: str | None = None secret_token: str | None = None
"""Unique token generated for each user, used for """Unique token generated for each user, used for
two-factor authentication.""" multi-factor authentication."""
hotp_counter: int | None = None hotp_counter: int | None = None
"""HMAC-based One Time Password counter, used for """HMAC-based One Time Password counter, used for
two-factor authentication.""" multi-factor authentication."""
one_time_password: str | None = None one_time_password: str | None = None
"""One time password used for email or sms two-factor authentication.""" """One time password used for email or sms multi-factor authentication."""
one_time_password_emission_date: datetime.datetime | None = None one_time_password_emission_date: datetime.datetime | None = None
"""A DateTime indicating when the user last emitted an email or sms one-time password.""" """A DateTime indicating when the user last emitted an email or sms one-time password."""

2
canaille/core/templates/setup-2fa.html
View file

@ -20,7 +20,7 @@
<div class="content"> <div class="content">
{{ _("Sign in as %(username)s", username=username) }} {{ _("Sign in as %(username)s", username=username) }}
</div> </div>
<div class="sub header">{% trans %}Set up Two-Factor Authentication.{% endtrans %}</div> <div class="sub header">{% trans %}Set up multi-factor authentication.{% endtrans %}</div>
</h2> </h2>
{% endblock %} {% endblock %}

4
canaille/translations/messages.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-12-12 09:58+0100\n" "POT-Creation-Date: 2024-12-12 12:02+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -1087,7 +1087,7 @@ msgid "Impersonate"
msgstr "" msgstr ""
#: canaille/core/templates/setup-2fa.html:23 #: canaille/core/templates/setup-2fa.html:23
msgid "Set up Two-Factor Authentication." msgid "Set up multi-factor authentication."
msgstr "" msgstr ""
#: canaille/core/templates/users.html:5 canaille/core/templates/users.html:29 #: canaille/core/templates/users.html:5 canaille/core/templates/users.html:29

2816
doc/locales/doc.pot
View file

File diff suppressed because it is too large Load diff

2
tests/core/test_totp_hotp.py
View file

@ -177,7 +177,7 @@ def test_new_user_setup_otp(testclient, backend, caplog, otp_method):
assert res.location == "/setup-2fa" assert res.location == "/setup-2fa"
assert ( assert (
"info", "info",
"You have not enabled Two-Factor Authentication. Please enable it first to login.", "You have not enabled multi-factor authentication. Please enable it first to login.",
) in res.flashes ) in res.flashes
res = testclient.get("/setup-2fa", status=200) res = testclient.get("/setup-2fa", status=200)
assert u.secret_token == res.form["secret"].value assert u.secret_token == res.form["secret"].value