IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Unify spelling of "One-Time Password"

Browse Source 
Spelling is in accordance with the HOTP
RFC 4226 and TOTP RFC 6238.

Reviewed-By: Alexander Bokovoy <abbra@users.noreply.github.com>
This commit is contained in:
Peter Keresztes Schmidt
2020-06-10 00:07:21 +02:00
committed by Florence Blanc-Renaud
parent d63a91da4b
commit ea5c0a1f7c
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
install/ui/src/freeipa/widgets/LoginScreen.js
View File

@@ -647,7 +647,7 @@ define(['dojo/_base/declare',
label: text.get('@i18n:login.password', "Password"),
placeholder: text.get(
'@i18n:login.password_and_otp',
'Password or Password+One-Time-Password'
'Password or Password+One-Time Password'
),
show_errors: false,
undo: false
@@ -713,7 +713,7 @@ define(['dojo/_base/declare',
label: text.get('@i18n:password.otp', "OTP"),
placeholder: text.get(
'@i18n:password.otp_long',
'One-Time-Password'
'One-Time Password'
),
show_errors: false,
undo: false

16
install/ui/test/data/i18n_messages.json
View File

@@ -206,7 +206,7 @@
"logout": "Log out",
"logout_error": "Log out error",
"password": "Password",
"password_and_otp": "Password or Password+One-Time-Password",
"password_and_otp": "Password or Password+One-Time Password",
"sync_otp_token": "Sync OTP Token",
"username": "Username"
},
@@ -459,14 +459,14 @@
"keytab": "Kerberos Key",
"keytab_missing": "Kerberos Key Not Present",
"keytab_present": "Kerberos Key Present, Host Provisioned",
"password": "One-Time-Password",
"password_missing": "One-Time-Password Not Present",
"password_present": "One-Time-Password Present",
"password": "One-Time Password",
"password_missing": "One-Time Password Not Present",
"password_present": "One-Time Password Present",
"password_reset_button": "Reset OTP",
"password_reset_title": "Reset One-Time-Password",
"password_reset_title": "Reset One-Time Password",
"password_set_button": "Set OTP",
"password_set_success": "OTP set",
"password_set_title": "Set One-Time-Password",
"password_set_title": "Set One-Time Password",
"status": "Status",
"unprovision": "Unprovision",
"unprovision_confirmation": "Are you sure you want to unprovision this host?",
@@ -749,12 +749,12 @@
"otp": "OTP",
"otp_info": "<i class=\"fa fa-info-circle\"></i> <strong>OTP (One-Time Password):</strong> Generate new OTP code for each OTP field.",
"otp_reset_info": "<i class=\"fa fa-info-circle\"></i> <strong>OTP (One-Time Password):</strong> Leave blank if you are not using OTP tokens for authentication.",
"otp_long": "One-Time-Password",
"otp_long": "One-Time Password",
"otp_sync_fail": "Token synchronization failed",
"otp_sync_invalid": "The username, password or token codes are not correct",
"otp_sync_success": "Token was synchronized",
"password": "Password",
"password_and_otp": "Password or Password+One-Time-Password",
"password_and_otp": "Password or Password+One-Time Password",
"password_change_complete": "Password change complete",
"password_must_match": "Passwords must match",
"reset_failure": "Password reset was not successful.",

20
ipaserver/plugins/internal.py
View File

@@ -406,7 +406,7 @@ class i18n_messages(Command):
"logout": _("Log out"),
"logout_error": _("Log out error"),
"password": _("Password"),
"password_and_otp": _("Password or Password+One-Time-Password"),
"password_and_otp": _("Password or Password+One Time-Password"),
"redirect_msg": _("You will be redirected in ${count}s"),
"sync_otp_token": _("Sync OTP Token"),
"synchronizing": _("Synchronizing"),
@@ -1000,14 +1000,14 @@ class i18n_messages(Command):
"keytab": _("Kerberos Key"),
"keytab_missing": _("Kerberos Key Not Present"),
"keytab_present": _("Kerberos Key Present, Host Provisioned"),
"password": _("One-Time-Password"),
"password_missing": _("One-Time-Password Not Present"),
"password_present": _("One-Time-Password Present"),
"password": _("One-Time Password"),
"password_missing": _("One-Time Password Not Present"),
"password_present": _("One-Time Password Present"),
"password_reset_button": _("Reset OTP"),
"password_reset_title": _("Reset One-Time-Password"),
"password_reset_title": _("Reset One-Time Password"),
"password_set_button": _("Set OTP"),
"password_set_success": _("OTP set"),
"password_set_title": _("Set One-Time-Password"),
"password_set_title": _("Set One-Time Password"),
"remove": _("Remove hosts"),
"remove_hosts_managing": _(
"Remove hosts managing host '${primary_key}'"
@@ -1680,19 +1680,19 @@ class i18n_messages(Command):
"otp": _("OTP"),
"otp_info":
_("<i class=\"fa fa-info-circle\"></i> <strong>"
"OTP (One-Time-Password):</strong>"
"OTP (One-Time Password):</strong>"
"Generate new OTP code for each OTP field."),
"otp_reset_info":
_("<i class=\"fa fa-info-circle\"></i> <strong>"
"OTP (One-Time-Password):</strong>"
"OTP (One-Time Password):</strong>"
"Leave blank if you are not using OTP tokens"
"for authentication."),
"otp_long": _("One-Time-Password"),
"otp_long": _("One-Time Password"),
"otp_sync_fail": _("Token synchronization failed"),
"otp_sync_invalid": _("The username, password or token codes are not correct"),
"otp_sync_success":_("Token was synchronized"),
"password": _("Password"),
"password_and_otp": _("Password or Password+One-Time-Password"),
"password_and_otp": _("Password or Password+One Time-Password"),
"password_change_complete": _("Password change complete"),
"password_expired": _(
"Your password has expired. Please enter a new password."),

10
ipatests/test_webui/data_loginscreen.py
View File

@@ -31,7 +31,7 @@ FILLED_LOGIN_FORM = {
('username', 'Username', True, True, 'text', 'username',
PKEY, 'Username'),
('password', 'Password', True, True, 'password', 'password',
PASSWD_ITEST_USER, 'Password or Password+One-Time-Password'),
PASSWD_ITEST_USER, 'Password or Password+One Time-Password'),
],
# structure of buttons
# button_name, button_title
@@ -63,7 +63,7 @@ RESET_AND_LOGIN_FORM = {
('verify_password', 'Verify Password', True, True, 'password',
'verify_password', '', 'New Password'),
('otp', 'OTP', False, True, 'password', 'otp', '',
'One-Time-Password'),
'One-Time Password'),
],
# structure of buttons
# button_name, button_title
@@ -94,7 +94,7 @@ RESET_PASSWORD_FORM = {
('verify_password', 'Verify Password', True, True, 'password',
'verify_password', '', 'New Password'),
('otp', 'OTP', False, True, 'password', 'otp', '',
'One-Time-Password'),
'One-Time Password'),
],
# structure of buttons
# button_name, button_title
@@ -121,7 +121,7 @@ EMPTY_LOGIN_FORM = {
('username', 'Username', False, True, 'text', 'username', '',
'Username'),
('password', 'Password', False, True, 'password', 'password', '',
'Password or Password+One-Time-Password'),
'Password or Password+One-Time Password'),
],
# structure of buttons
# button_name, button_title
@@ -146,7 +146,7 @@ LOGIN_FORM = {
('username', 'Username', True, True, 'text', 'username', PKEY,
'Username'),
('password', 'Password', True, True, 'password', 'password', '',
'Password or Password+One-Time-Password'),
'Password or Password+One-Time Password'),
],
# structure of buttons
# button_name, button_title