Permalink
Browse files

Allow yml messages to be configured by not using engine locales, whic…

…h, due to a Rails bug, always have higher priority than application locales
  • Loading branch information...
1 parent 3209e7d commit 9d56aa960396116297c5117bceb1fa7edc818635 @josevalim josevalim committed Oct 30, 2009
Showing with 5 additions and 1 deletion.
  1. +3 −0 CHANGELOG.rdoc
  2. +1 −0 lib/devise.rb
  3. +1 −1 {config → lib/devise}/locales/en.yml
View
@@ -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
View
@@ -66,6 +66,7 @@ def #{accessor}=(value)
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'
@@ -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.'

0 comments on commit 9d56aa9

Please sign in to comment.