diff options
| author | Matthew Draper <matthew@trebex.net> | 2015-04-05 02:53:54 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2015-04-05 02:55:00 +0930 |
| commit | 07875e2aa6ddf4c37b5997d6834bcb27ea50d02c (patch) | |
| tree | c33e9373a892ace84198c6608d60926feed3633b /actionview/lib | |
| parent | 191facc857bb4fb52078fb544c6bc1613a81cc80 (diff) | |
| parent | 6f3c65f6300f157e6ae5bfb839064383f3de11a9 (diff) | |
| download | rails-07875e2aa6ddf4c37b5997d6834bcb27ea50d02c.tar.gz rails-07875e2aa6ddf4c37b5997d6834bcb27ea50d02c.tar.bz2 rails-07875e2aa6ddf4c37b5997d6834bcb27ea50d02c.zip | |
Merge pull request #19649 from aprescott/allow-array-defaults
Allow an array to be a default translation value.
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 29a0860c00..9d7390f1fd 100644 --- a/actionview/lib/action_view/helpers/translation_helper.rb +++ b/actionview/lib/action_view/helpers/translation_helper.rb @@ -41,7 +41,7 @@ module ActionView remaining_defaults = Array(options.delete(:default)).compact if has_default && !remaining_defaults.first.kind_of?(Symbol) - options[:default] = remaining_defaults.shift + options[:default] = remaining_defaults end # If the user has explicitly decided to NOT raise errors, pass that option to I18n. |