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
heartcombo · Oct 30, 2009 · 9d56aa9 · 9d56aa9
1 parent 3209e7d
commit 9d56aa9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -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
 

diff --git a/lib/devise.rb b/lib/devise.rb
@@ -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'

diff --git a/config/locales/en.yml → lib/devise/locales/en.yml b/config/locales/en.yml → lib/devise/locales/en.yml
@@ -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.'