diff options
| author | goobertron <gooberfox@fastmail.co.uk> | 2014-02-09 17:47:48 +0400 |
|---|---|---|
| committer | goobertron <gooberfox@fastmail.co.uk> | 2014-02-09 19:48:06 +0400 |
| commit | 2a145e67abb72c0b6b4d67cee79995b22f196f58 (patch) | |
| tree | 0eb3b0de016d0c9c0ccab1e0ee78d73887385ca7 /config | |
| parent | 4a3869cda8b42eb7308dbc81f8e23c2786a85fe5 (diff) | |
Update design of forgot_password and change_password forms
Fix redirect to stream, make labels lower-case
Fix cuke
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/devise/devise.en.yml | 4 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml index cd6417802..ae07c7787 100644 --- a/config/locales/devise/devise.en.yml +++ b/config/locales/devise/devise.en.yml @@ -30,9 +30,13 @@ en: updated: 'Your password was changed successfully. You are now signed in.' edit: change_password: "Change my password" + new_password: "New password" + confirm_password: "Confirm password" new: forgot_password: "Forgot your password?" no_account: 'No account with this email exists' + reset_password: "Reset password" + email: "Email address" send_password_instructions: "Send me reset password instructions" confirmations: send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.' diff --git a/config/routes.rb b/config/routes.rb index a40fd9131..6ce3648f3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -108,7 +108,7 @@ Diaspora::Application.routes.draw do match 'users/edit' => redirect('/user/edit') devise_for :users, :controllers => {:registrations => "registrations", - :password => "devise/passwords", + :passwords => "passwords", :sessions => "sessions"} #legacy routes to support old invite routes |