diff options
| author | Max Melentiev <melentievm@gmail.com> | 2013-10-22 18:14:50 +0400 |
|---|---|---|
| committer | Max Melentiev <melentievm@gmail.com> | 2013-10-22 18:17:05 +0400 |
| commit | fde7344542a76e7f1f95a2265ac5480a1ef9aeed (patch) | |
| tree | 6a15a5fd7f393ca112dfc8ec1549641623dcdbac /actionpack/lib/abstract_controller | |
| parent | 40a8130bc5f00f0d77b152e75484f175d70cabdd (diff) | |
| download | rails-fde7344542a76e7f1f95a2265ac5480a1ef9aeed.tar.gz rails-fde7344542a76e7f1f95a2265ac5480a1ef9aeed.tar.bz2 rails-fde7344542a76e7f1f95a2265ac5480a1ef9aeed.zip | |
ActionController#translate also lookups shortcut without action name
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -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 |