From c92ef26b94c5489a274ed84a961e00eed95006b4 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Tue, 6 Jan 2015 21:06:09 -0500 Subject: [PATCH 1/2] Update find_message to accept scope This should still keep the devise lookup in the case that a customed scope is not passed as option, but if instead the custom scope is passed, then the find_message method will use it. This is kind of useful, if i don't want overwrite the devise locale, and use different locale files, but keeping still the fallback of my devise locale. --- app/controllers/devise_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/devise_controller.rb b/app/controllers/devise_controller.rb index 589bd62333..66c799d46f 100644 --- a/app/controllers/devise_controller.rb +++ b/app/controllers/devise_controller.rb @@ -167,7 +167,7 @@ def devise_i18n_options(options) # Get message for given def find_message(kind, options = {}) - options[:scope] = "devise.#{controller_name}" + options[:scope] = "devise.#{controller_name}" unless options[:scope] options[:default] = Array(options[:default]).unshift(kind.to_sym) options[:resource_name] = resource_name options = devise_i18n_options(options) From 6c5323c57424bfe72b502dd30888bbfec657f207 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Wed, 7 Jan 2015 14:46:02 -0500 Subject: [PATCH 2/2] Update devise_controller.rb --- app/controllers/devise_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/devise_controller.rb b/app/controllers/devise_controller.rb index 66c799d46f..91c6209fc1 100644 --- a/app/controllers/devise_controller.rb +++ b/app/controllers/devise_controller.rb @@ -167,7 +167,7 @@ def devise_i18n_options(options) # Get message for given def find_message(kind, options = {}) - options[:scope] = "devise.#{controller_name}" unless options[:scope] + options[:scope] ||= "devise.#{controller_name}" options[:default] = Array(options[:default]).unshift(kind.to_sym) options[:resource_name] = resource_name options = devise_i18n_options(options)