From 2e2326d380ef1160c7d3cbfc446f96ef6eab2721 Mon Sep 17 00:00:00 2001 From: jessib Date: Tue, 19 Feb 2013 14:18:25 -0800 Subject: Needs some cleanup, but this has one form where user can change username and password (they can leave either the same if they just want to change one, but we should make this clearer.) --- users/config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'users/config/locales/en.yml') diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml index 493b5db..d5f5795 100644 --- a/users/config/locales/en.yml +++ b/users/config/locales/en.yml @@ -8,6 +8,7 @@ en: wrong_password: "wrong password" user_not_found: "could not be found" change_login: "Change Login" + change_login_and_password: "Change Login and Password" change_password: "Change Password" cancel_account: "Cancel your account" set_email_address: "Set email address" -- cgit v1.2.3 From eb1cdaba1217ddd57fb801b13aadba29b356ba1e Mon Sep 17 00:00:00 2001 From: jessib Date: Mon, 25 Feb 2013 10:35:09 -0800 Subject: Add hint that password change is optional --- users/config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'users/config/locales/en.yml') 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: -- cgit v1.2.3 From 73e9332dadde9f37a85753faf40b9b6b2d73dd88 Mon Sep 17 00:00:00 2001 From: jessib Date: Mon, 25 Feb 2013 14:02:28 -0800 Subject: Admins cannot update a user. Eventually we will want to allow admins to update some user fields. --- users/config/locales/en.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'users/config/locales/en.yml') diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml index 2a5e6af..bda38fe 100644 --- a/users/config/locales/en.yml +++ b/users/config/locales/en.yml @@ -11,6 +11,8 @@ en: change_login_and_password: "Change Login and Password" change_password: "Change Password" cancel_account: "Cancel your account" + remove_account: "Remove Account" + admin_cancel_account: "Cancel the account %{username}" set_email_address: "Set email address" forward_email: "Forward email" email_aliases: "Email aliases" @@ -21,6 +23,7 @@ en: 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" + associated_email: "The associated email address is" activemodel: models: -- cgit v1.2.3