diff options
| -rw-r--r-- | activemodel/lib/active_model/serialization.rb | 5 | ||||
| -rw-r--r-- | activesupport/lib/active_support/number_helper.rb | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb index 44bc9efa47..341651d00d 100644 --- a/activemodel/lib/active_model/serialization.rb +++ b/activemodel/lib/active_model/serialization.rb @@ -31,8 +31,9 @@ module ActiveModel # of the attributes hash's keys. In order to override this behavior, take a look # at the private method +read_attribute_for_serialization+. # - # JSON Serialization module is automatically include the <tt>ActiveModel::Serialization</tt> - # module, so there is no need to explicitly include it. + # The JSON serialization is provided by default when you include the + # <tt>ActiveModel::Serialization</tt> module, so there is no need to explicitly + # include it. # # A minimal implementation including JSON would be: # diff --git a/activesupport/lib/active_support/number_helper.rb b/activesupport/lib/active_support/number_helper.rb index 5ab0f0a7ea..9762d95145 100644 --- a/activesupport/lib/active_support/number_helper.rb +++ b/activesupport/lib/active_support/number_helper.rb @@ -136,8 +136,8 @@ module ActiveSupport # * <tt>:separator</tt> - Sets the separator between the # fractional and integer digits (defaults to "."). # * <tt>:delimiter_pattern</tt> - Sets a custom regular expression used for - # for deriving, the placement of delimiter. Helpful when using currency - # formats like INR. + # deriving the placement of delimiter. Helpful when using currency formats + # like INR. # # ==== Examples # @@ -150,9 +150,10 @@ module ActiveSupport # number_to_delimited(12345678.05, locale: :fr) # => 12 345 678,05 # number_to_delimited('112a') # => 112a # number_to_delimited(98765432.98, delimiter: ' ', separator: ',') - # number_helper.number_to_delimited("123456.78", - # delimiter_pattern: /(\d+?)(?=(\d\d)+(\d)(?!\d))/) # => 1,23,456.78 - # # => 98 765 432,98 + # # => 98 765 432,98 + # number_to_delimited("123456.78", + # delimiter_pattern: /(\d+?)(?=(\d\d)+(\d)(?!\d))/) + # # => 1,23,456.78 def number_to_delimited(number, options = {}) NumberToDelimitedConverter.convert(number, options) end |