diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-10-10 02:14:18 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-10 02:14:18 -0300 |
| commit | a50cd3eb59a1696a2e525d03eea3c84aea95bdfc (patch) | |
| tree | 6a9204773119cf080b0d1678b742b3fbe4d5ebf7 /actionview/lib | |
| parent | 0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3 (diff) | |
| parent | 12d06dd91dd189df73186b0f537301dbac8af2e2 (diff) | |
| download | rails-a50cd3eb59a1696a2e525d03eea3c84aea95bdfc.tar.gz rails-a50cd3eb59a1696a2e525d03eea3c84aea95bdfc.tar.bz2 rails-a50cd3eb59a1696a2e525d03eea3c84aea95bdfc.zip | |
Merge pull request #26578 from jeremy/undeprecate-plural-positional-arg
Undeprecate plural positional argument
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/helpers/text_helper.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/actionview/lib/action_view/helpers/text_helper.rb b/actionview/lib/action_view/helpers/text_helper.rb index 0fea4df09c..bd3371ccc8 100644 --- a/actionview/lib/action_view/helpers/text_helper.rb +++ b/actionview/lib/action_view/helpers/text_helper.rb @@ -225,14 +225,7 @@ module ActionView # # pluralize(2, 'Person', locale: :de) # # => 2 Personen - def pluralize(count, singular, deprecated_plural = nil, plural: nil, locale: I18n.locale) - if deprecated_plural - ActiveSupport::Deprecation.warn("Passing plural as a positional argument " \ - "is deprecated and will be removed in Rails 5.1. Use e.g. " \ - "pluralize(1, 'person', plural: 'people') instead.") - plural ||= deprecated_plural - end - + def pluralize(count, singular, plural_arg = nil, plural: plural_arg, locale: I18n.locale) word = if (count == 1 || count =~ /^1(\.0+)?$/) singular else |