kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #26578 from jeremy/undeprecate-plural-positional-arg

Browse source 
Undeprecate plural positional argument
This commit is contained in:
Rafael França 2016-10-10 02:14:18 -03:00 committed by Rafael Mendonça França
parent 6ae7fde008
commit d621a26e06
No known key found for this signature in database
GPG key ID: FC23B6D0F1EEE948
2 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
actionview/lib/action_view/helpers/text_helper.rb
View file

@ -225,14 +225,7 @@ module ActionView
# #
# pluralize(2, 'Person', locale: :de) # pluralize(2, 'Person', locale: :de)
# # => 2 Personen # # => 2 Personen
def pluralize(count, singular, deprecated_plural = nil, plural: nil, locale: I18n.locale) def pluralize(count, singular, plural_arg = nil, plural: plural_arg, 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
word = if (count == 1 || count =~ /^1(\.0+)?$/) word = if (count == 1 || count =~ /^1(\.0+)?$/)
singular singular
else else

20
actionview/test/template/text_helper_test.rb
View file

@ -373,12 +373,14 @@ class TextHelperTest < ActionView::TestCase
def test_pluralization def test_pluralization
assert_equal("1 count", pluralize(1, "count")) assert_equal("1 count", pluralize(1, "count"))
assert_equal("2 counts", pluralize(2, "count")) assert_equal("2 counts", pluralize(2, "count"))
assert_equal("1 count", pluralize('1', "count")) assert_equal("1 count", pluralize("1", "count"))
assert_equal("2 counts", pluralize('2', "count")) assert_equal("2 counts", pluralize("2", "count"))
assert_equal("1,066 counts", pluralize('1,066', "count")) assert_equal("1,066 counts", pluralize("1,066", "count"))
assert_equal("1.25 counts", pluralize('1.25', "count")) assert_equal("1.25 counts", pluralize("1.25", "count"))
assert_equal("1.0 count", pluralize('1.0', "count")) assert_equal("1.0 count", pluralize("1.0", "count"))
assert_equal("1.00 count", pluralize('1.00', "count")) assert_equal("1.00 count", pluralize("1.00", "count"))
assert_equal("2 counters", pluralize(2, "count", "counters"))
assert_equal("0 counters", pluralize(nil, "count", "counters"))
assert_equal("2 counters", pluralize(2, "count", plural: "counters")) assert_equal("2 counters", pluralize(2, "count", plural: "counters"))
assert_equal("0 counters", pluralize(nil, "count", plural: "counters")) assert_equal("0 counters", pluralize(nil, "count", plural: "counters"))
assert_equal("2 people", pluralize(2, "person")) assert_equal("2 people", pluralize(2, "person"))
@ -405,12 +407,6 @@ class TextHelperTest < ActionView::TestCase
end end
end end
def test_deprecated_plural_as_positional_argument
assert_deprecated do
pluralize(2, 'count', 'counters')
end
end
def test_cycle_class def test_cycle_class
value = Cycle.new("one", 2, "3") value = Cycle.new("one", 2, "3")
assert_equal("one", value.to_s) assert_equal("one", value.to_s)