reverted #to_sentence to use red, green, and blue style

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3816 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

activesupport/lib/active_support/core_ext/array/conversions.rb

@@ -4,10 +4,10 @@ module Array #: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 false to return "a, b, and c" instead of "a, b and c".
+        # * <tt>:skip_last_comma</tt>: Set to true 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 => true
+          options.reverse_merge! :connector => 'and', :skip_last_comma => false
           
           case length
           	when 0

activesupport/test/core_ext/array_ext_test.rb

@@ -18,12 +18,12 @@ def test_plain_array_to_sentence
     assert_equal "", [].to_sentence
     assert_equal "one", ['one'].to_sentence
     assert_equal "one and two", ['one', 'two'].to_sentence
-    assert_equal "one, two and three", ['one', 'two', 'three'].to_sentence
+    assert_equal "one, two, and three", ['one', 'two', 'three'].to_sentence
     
   end
   
   def test_to_sentence_with_connector
-    assert_equal "one, two and also three", ['one', 'two', 'three'].to_sentence(:connector => 'and also')
+    assert_equal "one, two, and also three", ['one', 'two', 'three'].to_sentence(:connector => 'and also')
   end
   
   def test_to_sentence_with_skip_last_comma