sr-rolando/contactorama
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update Devise to version 2. Comes with some error that prevents the whole up from running, though.

Browse source
This commit is contained in:
Roland Jesse 2012-04-22 23:03:20 +02:00
parent a1b11d20c1
commit 761c73a036
5 changed files with 69 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
config/initializers/devise.rb
View file

@ -63,18 +63,19 @@ Devise.setup do |config|
# You can use this to let your user access some features of your application
# without confirming the account, but blocking it after a certain period
# (ie 2 days).
# config.confirm_within = 2.days
# config.allow_unconfirmed_access_for = 2.days
# Defines which key will be used when confirming an account
# config.confirmation_keys = [ :email ]
# Devise 2.0: Support for e-mail reconfirmation when it changes.
# needs: adding an unconfirmed_email column to your Devise models
config.reconfirmable = true
# ==> Configuration for :rememberable
# The time the user will be remembered without asking for credentials again.
# config.remember_for = 2.weeks
# If true, a valid remember token can be re-used between multiple browsers.
# config.remember_across_browsers = true
# If true, extends the user's remember period when remembered via cookie.
# config.extend_remember_period = false
@ -122,6 +123,10 @@ Devise.setup do |config|
# Defines which key will be used when recovering the password for an account
# config.reset_password_keys = [ :email ]
# [Devise 2.0] Devise now requires you to have a reset_password_sent_at column.
# Please add it to your Devise models and set Devise.reset_password_within to an interval (like 6 hours)
config.reset_password_within = 6
# ==> Configuration for :encryptable
# Allow you to use another encryption algorithm besides bcrypt (default). You can use
# :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
@ -136,7 +141,10 @@ Devise.setup do |config|
# If true, authentication through token does not store user in session and needs
# to be supplied on each request. Useful if you are using the token as API token.
# config.stateless_token = false
# Devise 2.0: stateless_token was removed.
# If you want to have stateless tokens, simply do
# config.skip_session_storage << :auth_token
# in your initializer;
# ==> Scopes configuration
# Turn scoped views on. Before rendering "sessions/new", it will first check for

4
config/locales/devise.en.yml
View file

@ -30,7 +30,9 @@ en:
confirmed: 'Your account was successfully confirmed. You are now signed in.'
registrations:
signed_up: 'Welcome! You have signed up successfully.'
inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.'
signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
updated: 'You updated your account successfully.'
destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
unlocks: