diff options
| author | Jonne Haß <me@mrzyx.de> | 2014-02-10 04:35:37 +0400 |
|---|---|---|
| committer | Jonne Haß <me@mrzyx.de> | 2014-02-10 04:35:37 +0400 |
| commit | 3a616469f4167e29c9770a287934666ddf6f362a (patch) | |
| tree | 601172d92407483182a8ee447977cce4927d78ca /config | |
| parent | b59bb75b3d9fdc3f55d38e529ca91be371c207bb (diff) | |
| parent | 2a145e67abb72c0b6b4d67cee79995b22f196f58 (diff) | |
Merge pull request #4707 from goobertron/improved_new_password
New reset password form
Conflicts:
Changelog.md
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 37305f948..38405a721 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 |