diff options
Diffstat (limited to 'actionpack/lib/abstract_controller/translation.rb')
-rw-r--r-- | actionpack/lib/abstract_controller/translation.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/translation.rb b/actionpack/lib/abstract_controller/translation.rb index ea2551cb70..56b8ce895e 100644 --- a/actionpack/lib/abstract_controller/translation.rb +++ b/actionpack/lib/abstract_controller/translation.rb @@ -10,7 +10,11 @@ module AbstractController # simple framework for scoping them consistently. def translate(key, options = {}) if key.to_s.first == '.' - key = "#{ controller_path.tr('/', '.') }.#{ action_name }#{ key }" + path = controller_path.tr('/', '.') + defaults = [:"#{path}#{key}"] + defaults << options[:default] if options[:default] + options[:default] = defaults + key = "#{path}.#{action_name}#{key}" end I18n.translate(key, options) end |