"+this.otp_info_msg+"
"); }, constructor: function(spec) { diff --git a/install/ui/src/freeipa/widgets/LoginScreenBase.js b/install/ui/src/freeipa/widgets/LoginScreenBase.js index 819f832a0..2d14bb95a 100644 --- a/install/ui/src/freeipa/widgets/LoginScreenBase.js +++ b/install/ui/src/freeipa/widgets/LoginScreenBase.js @@ -60,6 +60,9 @@ define(['dojo/_base/declare', caps_warning_msg: "Warning: CAPS LOCK key is on", + otp_info_msg: " One-Time-Password(OTP): \ + Generate new OTP code for each OTP field.", + /** * Details builder * @property {IPA.details_builder} @@ -331,6 +334,9 @@ define(['dojo/_base/declare', constructor: function(spec) { spec = spec || {}; declare.safeMixin(this, spec); + + this.otp_info_msg = text.get(spec.otp_info_msg || '@i18n:password.otp_info', + this.otp_info_msg); } }); return LoginScreenBase; diff --git a/install/ui/src/freeipa/widgets/SyncOTPScreen.js b/install/ui/src/freeipa/widgets/SyncOTPScreen.js index 13c47ae88..f7e4fedab 100644 --- a/install/ui/src/freeipa/widgets/SyncOTPScreen.js +++ b/install/ui/src/freeipa/widgets/SyncOTPScreen.js @@ -179,6 +179,8 @@ define(['dojo/_base/declare', constructor: function(spec) { spec = spec || {}; + this.aside = "" + this.otp_info_msg + "
"; + this.sync_fail = text.get(spec.sync_fail || '@i18n:password.otp_sync_fail', this.sync_fail); diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 8a482134d..28ec80b24 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -141,9 +141,9 @@ "pad": "PAD" }, "login": { - "form_auth": "To login with username and password, enter them in the fields below then click Login.", + "form_auth": " To login with username and password, enter them in the corresponding fields, then click Login.", "header": "Logged In As", - "krb_auth_msg": "To login with Kerberos, please make sure you have valid tickets (obtainable via kinit) and configured the browser correctly, then click Login.", + "krb_auth_msg": " To login with Kerberos, please make sure you have valid tickets (obtainable via kinit) and configured the browser correctly, then click Login.", "login": "Login", "logout": "Logout", "logout_error": "Logout error", @@ -517,6 +517,7 @@ "new_password": "New Password", "new_password_required": "New password is required", "otp": "OTP", + "otp_info": " One-Time-Password(OTP): Generate new OTP code for each OTP field.", "otp_long": "One-Time-Password", "otp_sync_fail": "Token synchronization failed", "otp_sync_invalid": "The username, password or token codes are not correct", diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index 1a8d9cad3..4162b9105 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -283,9 +283,9 @@ class i18n_messages(Command): "pad": _("PAD"), }, "login": { - "form_auth": _("To login with username and password, enter them in the fields below then click Login."), + "form_auth": _(" To login with username and password, enter them in the corresponding fields, then click Login."), "header": _("Logged In As"), - "krb_auth_msg": _("To login with Kerberos, please make sure you have valid tickets (obtainable via kinit) and configured the browser correctly, then click Login."), + "krb_auth_msg": _(" To login with Kerberos, please make sure you have valid tickets (obtainable via kinit) and configured the browser correctly, then click Login."), "login": _("Login"), "logout": _("Logout"), "logout_error": _("Logout error"), @@ -662,6 +662,7 @@ class i18n_messages(Command): "new_password": _("New Password"), "new_password_required": _("New password is required"), "otp": _("OTP"), + "otp_info": _(" One-Time-Password(OTP): Generate new OTP code for each OTP field."), "otp_long": _("One-Time-Password"), "otp_sync_fail": _("Token synchronization failed"), "otp_sync_invalid": _("The username, password or token codes are not correct"),