diff options
| author | jessib <jessib@leap.se> | 2012-11-26 10:15:22 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2012-11-26 10:15:22 -0800 |
| commit | 3e744e4e226eae3ea2f900d9fccc32b6c046d65f (patch) | |
| tree | 1b19232d08229b178c094c92e2242ce1686099ae /users/config | |
| parent | d9d67bd60d3fdfa4106977de9e5aba11f659fc79 (diff) | |
| parent | bf74255d1530fe5852dc6e6c27ef975ce9aa8d3c (diff) | |
Merge branch 'develop' into help_develop
Conflicts:
users/app/views/sessions/_nav.html.haml
Diffstat (limited to 'users/config')
| -rw-r--r-- | users/config/locales/en.yml | 8 | ||||
| -rw-r--r-- | users/config/routes.rb | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml index 172b85f..1260494 100644 --- a/users/config/locales/en.yml +++ b/users/config/locales/en.yml @@ -4,3 +4,11 @@ en: cancel: "Cancel" login: "Login" login_message: "Please login with your account." + wrong_password: "wrong password" + user_not_found: "could not be found" + + activemodel: + models: + user: + one: User + other: "%{count} Users" diff --git a/users/config/routes.rb b/users/config/routes.rb index 522c40c..1d144b4 100644 --- a/users/config/routes.rb +++ b/users/config/routes.rb @@ -5,6 +5,6 @@ Rails.application.routes.draw do resources :sessions, :only => [:new, :create, :update, :destroy] get "signup" => "users#new", :as => "signup" - resources :users, :only => [:new, :create] + resources :users end |