diff options
| -rw-r--r-- | install/ui/src/freeipa/widgets/LoginScreen.js | 8 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 3 | ||||
| -rw-r--r-- | ipalib/plugins/internal.py | 3 |
3 files changed, 13 insertions, 1 deletions
diff --git a/install/ui/src/freeipa/widgets/LoginScreen.js b/install/ui/src/freeipa/widgets/LoginScreen.js index 701c88cf1..78991d0a9 100644 --- a/install/ui/src/freeipa/widgets/LoginScreen.js +++ b/install/ui/src/freeipa/widgets/LoginScreen.js @@ -568,6 +568,7 @@ define(['dojo/_base/declare', $type: 'text', name: 'username', label: text.get('@i18n:login.username', "Username"), + placeholder: text.get('@i18n:login.username', "Username"), show_errors: false, undo: false }, @@ -575,6 +576,7 @@ define(['dojo/_base/declare', $type: 'password', name: 'password', label: text.get('@i18n:login.password', "Password"), + placeholder: text.get('@i18n:login.password_and_otp', 'Password or Password+One-Time-Password'), show_errors: false, undo: false }, @@ -589,13 +591,15 @@ define(['dojo/_base/declare', name: 'current_password', $type: 'password', label: text.get('@i18n:login.current_password', "Current Password"), + placeholder: text.get('@i18n:login.current_password', "Current Password"), show_errors: false, undo: false }, { name: 'otp', $type: 'password', - label: text.get('@i18n:login.current_password', "OTP"), + label: text.get('@i18n:password.otp', "OTP"), + placeholder: text.get('@i18n:password.otp_long', 'One-Time-Password'), show_errors: false, undo: false }, @@ -604,6 +608,7 @@ define(['dojo/_base/declare', $type: 'password', required: true, label: text.get('@i18n:password.new_password)', "New Password"), + placeholder: text.get('@i18n:password.new_password)', "New Password"), show_errors: false, undo: false }, @@ -612,6 +617,7 @@ define(['dojo/_base/declare', $type: 'password', required: true, label: text.get('@i18n:password.verify_password', "Verify Password"), + placeholder: text.get('@i18n:password.new_password)', "New Password"), validators: [{ $type: 'same_password', other_field: 'new_password' diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 8a96e2330..2ce5120e9 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -512,7 +512,10 @@ "invalid_password": "The password or username you entered is incorrect.", "new_password": "New Password", "new_password_required": "New password is required", + "otp": "OTP", + "otp_long": "One-Time-Password", "password": "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.", diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index e3c0faff1..4a3745ae7 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -652,7 +652,10 @@ class i18n_messages(Command): "invalid_password": _("The password or username you entered is incorrect."), "new_password": _("New Password"), "new_password_required": _("New password is required"), + "otp": _("OTP"), + "otp_long": _("One-Time-Password"), "password": _("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."), |