diff options
| author | Tarmo Tänav <tarmo@itech.ee> | 2008-10-07 14:23:05 +0300 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-10-09 01:19:02 +0100 |
| commit | d69b4b7bea28fcab04f61afe381e06fa8e37b429 (patch) | |
| tree | eb58b3068cbe3a76e79a0c373f1458e4d05ab083 /activesupport/lib/active_support/core_ext | |
| parent | 0dea211f44d85e9c28963784286838bfa6c343f9 (diff) | |
| download | rails-d69b4b7bea28fcab04f61afe381e06fa8e37b429.tar.gz rails-d69b4b7bea28fcab04f61afe381e06fa8e37b429.tar.bz2 rails-d69b4b7bea28fcab04f61afe381e06fa8e37b429.zip | |
Made i18n simple backend able to store false values (and not confuse them with nil or lack of value)
Implemented support.array.skip_last_comma i18n key for
Array#to_sentence, this also tests the ability to store false.
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'activesupport/lib/active_support/core_ext')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/array/conversions.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb index e67b719ddb..11c128da22 100644 --- a/activesupport/lib/active_support/core_ext/array/conversions.rb +++ b/activesupport/lib/active_support/core_ext/array/conversions.rb @@ -11,7 +11,8 @@ module ActiveSupport #:nodoc: options.assert_valid_keys(:connector, :skip_last_comma, :locale) default = I18n.translate(:'support.array.sentence_connector', :locale => options[:locale]) - options.reverse_merge! :connector => default, :skip_last_comma => false + default_skip_last_comma = I18n.translate(:'support.array.skip_last_comma', :locale => options[:locale]) + options.reverse_merge! :connector => default, :skip_last_comma => default_skip_last_comma options[:connector] = "#{options[:connector]} " unless options[:connector].nil? || options[:connector].strip == '' case length |