aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorTobias Lütke <tobias.luetke@gmail.com>2006-03-06 22:36:37 +0000
committerTobias Lütke <tobias.luetke@gmail.com>2006-03-06 22:36:37 +0000
commit66386df3d98974fa3f3732693849fcd954da9bbf (patch)
treec6ff342ec4fb27e7e91b50cda83b24c815d5c975 /activesupport
parent08967ead78d888ff058da014569932ccf04dceda (diff)
downloadrails-66386df3d98974fa3f3732693849fcd954da9bbf.tar.gz
rails-66386df3d98974fa3f3732693849fcd954da9bbf.tar.bz2
rails-66386df3d98974fa3f3732693849fcd954da9bbf.zip
changed default of Array#to_sentence to use one, two and three notation ( skip_last_comma => true )
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3802 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/array/conversions.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
index 46962ded1b..f119bb6c78 100644
--- a/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -5,10 +5,10 @@ module ActiveSupport #:nodoc:
module Conversions
# Converts the array to comma-seperated sentence where the last element is joined by the connector word. Options:
# * <tt>:connector</tt>: The word used to join the last element in arrays with more than two elements (default: "and")
- # * <tt>:skip_last_comma</tt>: Set to true to return "a, b and c" instead of "a, b, and c".
+ # * <tt>:skip_last_comma</tt>: Set to false to return "a, b, and c" instead of "a, b and c".
def to_sentence(options = {})
options.assert_valid_keys(:connector, :skip_last_comma)
- options.reverse_merge! :connector => 'and', :skip_last_comma => false
+ options.reverse_merge! :connector => 'and', :skip_last_comma => true
case length
when 0