Move failure messages from devise.sessions to devise.failure.

lib/devise.rb

@@ -29,11 +29,10 @@ module Devise
 
   # Constants which holds devise configuration for extensions. Those should
   # not be modified by the "end user".
-  ALL            = []
-  CONTROLLERS    = ActiveSupport::OrderedHash.new
-  ROUTES         = ActiveSupport::OrderedHash.new
-  STRATEGIES     = ActiveSupport::OrderedHash.new
-  FLASH_MESSAGES = [:unauthenticated]
+  ALL         = []
+  CONTROLLERS = ActiveSupport::OrderedHash.new
+  ROUTES      = ActiveSupport::OrderedHash.new
+  STRATEGIES  = ActiveSupport::OrderedHash.new
 
   # True values used to check params
   TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE']
@@ -189,11 +188,10 @@ module Devise
   #
   def self.add_module(module_name, options = {})
     ALL << module_name
-    options.assert_valid_keys(:strategy, :model, :controller, :route, :flash)
+    options.assert_valid_keys(:strategy, :model, :controller, :route)
 
     config = {
       :strategy => STRATEGIES,
-      :flash => FLASH_MESSAGES,
       :route => ROUTES,
       :controller => CONTROLLERS
     }

lib/devise/failure_app.rb

@@ -56,7 +56,7 @@ module Devise
 
       if message.is_a?(Symbol)
         I18n.t(:"#{scope}.#{message}", :resource_name => scope,
-               :scope => [:devise, :sessions], :default => [message, message.to_s])
+               :scope => "devise.failure", :default => [message, message.to_s])
       else
         message.to_s
       end

lib/devise/modules.rb

@@ -3,8 +3,8 @@ require 'active_support/core_ext/object/with_options'
 Devise.with_options :model => true do |d|
   # Strategies first
   d.with_options :strategy => true do |s|      
-    s.add_module :database_authenticatable, :controller => :sessions, :flash => :invalid,       :route => :session
-    s.add_module :token_authenticatable,    :controller => :sessions, :flash => :invalid_token, :route => :session
+    s.add_module :database_authenticatable, :controller => :sessions, :route => :session
+    s.add_module :token_authenticatable,    :controller => :sessions, :route => :session
     s.add_module :rememberable
   end
 
@@ -14,10 +14,10 @@ Devise.with_options :model => true do |d|
   d.add_module :validatable
 
   # The ones which can sign out after
-  d.add_module :activatable,                                 :flash => :inactive
-  d.add_module :confirmable,  :controller => :confirmations, :flash => :unconfirmed, :route => :confirmation
-  d.add_module :lockable,     :controller => :unlocks,       :flash => :locked,      :route => :unlock
-  d.add_module :timeoutable,                                 :flash => :timeout
+  d.add_module :activatable
+  d.add_module :confirmable,  :controller => :confirmations, :route => :confirmation
+  d.add_module :lockable,     :controller => :unlocks,       :route => :unlock
+  d.add_module :timeoutable
 
   # Stats for last, so we make sure the user is really signed in
   d.add_module :trackable

lib/devise/rails.rb

@@ -16,5 +16,20 @@ module Devise
     initializer "devise.add_url_helpers" do |app|
       Devise::FailureApp.send :include, app.routes.url_helpers
     end
+
+    config.after_initialize do
+      I18n.available_locales
+      flash = [:unauthenticated, :unconfirmed, :invalid, :invalid_token, :timeout, :inactive, :locked]
+
+      I18n.backend.send(:translations).each do |locale, translations|
+        keys = flash & (translations[:devise][:sessions].keys) rescue []
+
+        if keys.any?
+          ActiveSupport::Deprecation.warn "The following I18n messages in 'devise.sessions' " <<
+            "for locale '#{locale}' are deprecated: #{keys.to_sentence}. Please move them to " <<
+            "'devise.failure' instead."
+        end
+      end
+    end
   end
 end