kotovalexarian-likes-github/heartcombo--devise
1
0
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2022-11-09 12:18:31 -05:00
Code Releases Activity

Allow yml messages to be configured by not using engine locales, which, due to a Rails bug, always have higher priority than application locales

Browse source
This commit is contained in:
José Valim 2009-10-30 07:33:55 -02:00
parent 3209e7d988
commit 9d56aa9603
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.rdoc
View file

@ -1,3 +1,6 @@
* bug fix
* [#15] Allow yml messages to be configured by not using engine locales
* deprecations
* Renamed confirm_in to confirm_within

1
lib/devise.rb
View file

@ -66,6 +66,7 @@ end
Rails.configuration.after_initialize do
ActiveRecord::Base.extend Devise::ActiveRecord
ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Devise::Migrations
I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), 'devise', 'locales', 'en.yml'))
end
require 'devise/warden'

2
config/locales/en.yml → lib/devise/locales/en.yml
View file

@ -4,7 +4,7 @@ en:
signed_in: 'Signed in successfully.'
signed_out: 'Signed out successfully.'
unauthenticated: 'You need to sign in or sign up before continuing.'
unconfirmed: 'Your account was not confirmed and your confirmation period has expired.'
unconfirmed: 'You have to confirm your account before continuing.'
invalid: 'Invalid email or password.'
passwords:
send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'