diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 20:44:43 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 20:44:43 -0400 |
| commit | 38d6960be1efdb6345445ab293a8cd605193785f (patch) | |
| tree | df37e79b5744b570aded5aa4d7fe38cd772a49fe /config | |
| parent | bcfa571b0328a4b3e94479a31c027621ceb86ad5 (diff) | |
| parent | d14dcf9af11a0f2eab2609efb7d9e59a9cc18bb0 (diff) | |
Merge branch 'master' into luke
Conflicts:
app/controllers/application_controller.rb
app/controllers/tournaments_controller.rb
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 8 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 0653957..9b7f013 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -21,3 +21,11 @@ en: hello: "Hello world" + + simple_captcha: + placeholder: "Enter the image value" + label: "Enter the code in the box:" + + message: + default: "Secret Code did not match with the Image" + user: "The secret Image and code were different" diff --git a/config/routes.rb b/config/routes.rb index 45694aa..dc0325a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -13,6 +13,8 @@ Leaguer::Application.routes.draw do resource :server, only: [:show, :edit, :update] + #match 'simple_captcha/:id', :to => 'simple_captcha#show', :as => :simple_captcha + resources :teams resources :tournaments do resources :matches, only: [:index, :show] |