aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-11-05 05:04:21 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-11-05 05:04:21 +0000
commit4d5b913fcf73b352f5a426c862dbeb483d67a9a3 (patch)
tree4bd368d610916f32e470a9d320500a24812e9725 /actionpack/lib
parent080ec9803e340e36d2635a272ee4cf9a243945fe (diff)
downloadrails-4d5b913fcf73b352f5a426c862dbeb483d67a9a3.tar.gz
rails-4d5b913fcf73b352f5a426c862dbeb483d67a9a3.tar.bz2
rails-4d5b913fcf73b352f5a426c862dbeb483d67a9a3.zip
pluralize helper interprets nil as zero. Closes #6474.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5431 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/text_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index f1d67c53bb..c5b757d6e1 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -85,7 +85,7 @@ module ActionView
# pluralize(2, 'person') => 2 people
# pluralize(3, 'person', 'users') => 3 users
def pluralize(count, singular, plural = nil)
- "#{count} " + if count == 1 || count == '1'
+ "#{count || 0} " + if count == 1 || count == '1'
singular
elsif plural
plural