diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2019-06-17 13:38:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-17 13:38:39 -0400 |
| commit | c65acad0df6b332324c24e725c7d581bd76f9760 (patch) | |
| tree | 64498e98c2102fd59f2b87dd54a2c2fb0226f8cb /actionview/lib | |
| parent | c104bfe424e6cebe9c8e85a38515327a6c88b1f8 (diff) | |
| parent | 5d4a77d324fa30c616d0e05144edc57f10cfb9b5 (diff) | |
| download | rails-c65acad0df6b332324c24e725c7d581bd76f9760.tar.gz rails-c65acad0df6b332324c24e725c7d581bd76f9760.tar.bz2 rails-c65acad0df6b332324c24e725c7d581bd76f9760.zip | |
Merge pull request #36482 from Shopify/fix-translation-helper-default-hash
Fix TranslationHelper#translate handling of Hash defaults
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/helpers/translation_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/translation_helper.rb b/actionview/lib/action_view/helpers/translation_helper.rb index d5b0a9263f..baa337c62f 100644 --- a/actionview/lib/action_view/helpers/translation_helper.rb +++ b/actionview/lib/action_view/helpers/translation_helper.rb @@ -60,7 +60,7 @@ module ActionView def translate(key, options = {}) options = options.dup if options.has_key?(:default) - remaining_defaults = Array(options.delete(:default)).compact + remaining_defaults = Array.wrap(options.delete(:default)).compact options[:default] = remaining_defaults unless remaining_defaults.first.kind_of?(Symbol) end |