diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-06-14 16:55:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 16:55:34 -0400 |
| commit | f340490b98ac9f13f004b5db8863cb3ff6fb71f9 (patch) | |
| tree | 9a957cc5351cca5053351e5a2664ca7d3ad19abc /actionpack | |
| parent | b81288541b6c8fe04082e4579e549bd71bc350dd (diff) | |
| parent | ff3c06f718a80c5d943e93e3cb1c784911d5c423 (diff) | |
| download | rails-f340490b98ac9f13f004b5db8863cb3ff6fb71f9.tar.gz rails-f340490b98ac9f13f004b5db8863cb3ff6fb71f9.tar.bz2 rails-f340490b98ac9f13f004b5db8863cb3ff6fb71f9.zip | |
Merge pull request #29451 from vipulnsward/29441-flatten-default
Allow translate default option to accept an array similar to i18n.t
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/translation.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/abstract/translation_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/translation.rb b/actionpack/lib/abstract_controller/translation.rb index 9e3858802a..e4ac95df50 100644 --- a/actionpack/lib/abstract_controller/translation.rb +++ b/actionpack/lib/abstract_controller/translation.rb @@ -13,7 +13,7 @@ module AbstractController path = controller_path.tr("/", ".") defaults = [:"#{path}#{key}"] defaults << options[:default] if options[:default] - options[:default] = defaults + options[:default] = defaults.flatten key = "#{path}.#{action_name}#{key}" end I18n.translate(key, options) diff --git a/actionpack/test/abstract/translation_test.rb b/actionpack/test/abstract/translation_test.rb index 0c4071df8d..4893144905 100644 --- a/actionpack/test/abstract/translation_test.rb +++ b/actionpack/test/abstract/translation_test.rb @@ -62,6 +62,7 @@ module AbstractController def test_default_translation @controller.stub :action_name, :index do assert_equal "bar", @controller.t("one.two") + assert_equal "baz", @controller.t(".twoz", default: ["baz", :twoz]) end end |