diff options
| author | jessib <jessib@riseup.net> | 2013-08-27 12:18:35 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-08-27 12:18:35 -0700 |
| commit | dc41ae0a3fb0a137e716d8ec63084b0ec3a7299b (patch) | |
| tree | c09fef161f105e7c03c35d1edcb2d257144cb97d /users/config | |
| parent | a87c750d1f12f15272beb117f8ee12ab711cc6d1 (diff) | |
| parent | e481b8cbc05a858674a59ef36d695973622f6b3a (diff) | |
Merge branch 'master' into billing_with_tests
Diffstat (limited to 'users/config')
| -rw-r--r-- | users/config/initializers/add_controller_methods.rb | 1 | ||||
| -rw-r--r-- | users/config/locales/en.yml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/users/config/initializers/add_controller_methods.rb b/users/config/initializers/add_controller_methods.rb index 2579176..f572ecb 100644 --- a/users/config/initializers/add_controller_methods.rb +++ b/users/config/initializers/add_controller_methods.rb @@ -1,3 +1,4 @@ ActiveSupport.on_load(:application_controller) do include ControllerExtension::Authentication + include ControllerExtension::TokenAuthentication end diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml index 1aa7005..55ba3a1 100644 --- a/users/config/locales/en.yml +++ b/users/config/locales/en.yml @@ -12,6 +12,7 @@ en: change_password: "Change Password" login_message: "Please log in with your account." invalid_user_pass: "Not a valid username/password combination" + invalid_ephemeral: "Invalid random key used. This looked like an attempt to hack the site to us. If it wasn't please contact support so we can look into the issue." all_strategies_failed: "Could not understand your login attempt. Please first send your login and a SRP ephemeral value A and then send the client_auth in the same session (using cookies)." update_login_and_password: "Update Login and Password" destroy_my_account: "Destroy my account" @@ -31,7 +32,7 @@ en: not_authorized_login: "Please log in to perform that action." search: "Search" cookie_disabled_warning: "You have cookies disabled. You will not be able to login until you enable cookies." - js_required: "We are sorry, but this doesn't work without javascript enabled. This is for security reasons." + js_required_html: "We are sorry, but this doesn't work without javascript enabled. This is because the authentication system used, <a href='http://srp.stanford.edu/'>SRP</a>, requires javascript." enable_account: "Enable the account %{username}" enable_description: "This will restore the account to full functionality" deactivate_account: "Deactivate the account %{username}" |