diff options
| author | jessib <jessib@riseup.net> | 2012-10-17 10:12:11 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2012-10-17 10:12:11 -0700 |
| commit | c072a2fe1d50715bad1cd8c14213cba6aa1cc8ff (patch) | |
| tree | 14a599dadbe440952c0de73c487113bc09aa9142 /users/config | |
| parent | 171d07a64d3f76e68c22f0fb4cc3795daad806d1 (diff) | |
| parent | d9a510fa2126c29f0af58c6bbeff35802777eee6 (diff) | |
Merge branch 'develop' into help_develop
Diffstat (limited to 'users/config')
| -rw-r--r-- | users/config/locales/en.yml | 6 | ||||
| -rw-r--r-- | users/config/routes.rb | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml new file mode 100644 index 0000000..172b85f --- /dev/null +++ b/users/config/locales/en.yml @@ -0,0 +1,6 @@ +en: + signup: "Sign up" + signup_message: "Please create an account." + cancel: "Cancel" + login: "Login" + login_message: "Please login with your account." diff --git a/users/config/routes.rb b/users/config/routes.rb index cfc0407..522c40c 100644 --- a/users/config/routes.rb +++ b/users/config/routes.rb @@ -1,10 +1,10 @@ Rails.application.routes.draw do - get "log_in" => "sessions#new", :as => "log_in" - get "log_out" => "sessions#destroy", :as => "log_out" + get "login" => "sessions#new", :as => "login" + get "logout" => "sessions#destroy", :as => "logout" resources :sessions, :only => [:new, :create, :update, :destroy] - get "sign_up" => "users#new", :as => "sign_up" + get "signup" => "users#new", :as => "signup" resources :users, :only => [:new, :create] end |