summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2013-02-25 10:35:09 -0800
committerjessib <jessib@leap.se>2013-02-25 10:35:09 -0800
commiteb1cdaba1217ddd57fb801b13aadba29b356ba1e (patch)
tree6a18f8fc79fcbf9f979a0b1c353a1995aa58a8c5 /users
parent2e2326d380ef1160c7d3cbfc446f96ef6eab2721 (diff)
Add hint that password change is optional
Diffstat (limited to 'users')
-rw-r--r--users/app/views/users/_login_and_password_fields.html.haml4
-rw-r--r--users/config/locales/en.yml1
2 files changed, 3 insertions, 2 deletions
diff --git a/users/app/views/users/_login_and_password_fields.html.haml b/users/app/views/users/_login_and_password_fields.html.haml
index 4d4585a..5f38a9c 100644
--- a/users/app/views/users/_login_and_password_fields.html.haml
+++ b/users/app/views/users/_login_and_password_fields.html.haml
@@ -1,3 +1,3 @@
-= f.input :login, :required => true, :input_html => { :id => :srp_username }
+= f.input :login, :input_html => { :id => :srp_username }
= f.input :password, :required => true, :validate => true, :input_html => { :id => :srp_password }
-= f.input :password_confirmation, :required => true, :input_html => { :id => :srp_password_confirmation } \ No newline at end of file
+= f.input :password_confirmation, :hint => t(:can_retype_old_password), :required => true, :input_html => { :id => :srp_password_confirmation } \ No newline at end of file
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index d5f5795..2a5e6af 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -20,6 +20,7 @@ en:
user_created_successfully: "Successfully created your account."
email_alias_destroyed_successfully: "Successfully removed the alias '%{alias}'."
use_ascii_key: "Use ASCII-armored PGP key"
+ can_retype_old_password: "Retype your old password if you would like to keep that"
activemodel:
models: