diff options
| author | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-07-06 21:20:02 +0200 |
|---|---|---|
| committer | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-07-06 21:20:02 +0200 |
| commit | 84816ae981a8598e5e401eb1b9b805de840fefc9 (patch) | |
| tree | 8b995401f92c8dcd8c53e3f332687219480e4def /activesupport/lib/active_support | |
| parent | c9ed2c9bd24b9f4cdfcb692151f87ba900469e71 (diff) | |
| download | rails-84816ae981a8598e5e401eb1b9b805de840fefc9.tar.gz rails-84816ae981a8598e5e401eb1b9b805de840fefc9.tar.bz2 rails-84816ae981a8598e5e401eb1b9b805de840fefc9.zip | |
align with changes in i18n
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/array/conversions.rb | 5 | ||||
| m--------- | activesupport/lib/active_support/vendor/i18n-0.0.1 | 0 |
2 files changed, 1 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb index 80bf1404de..59dc96754f 100644 --- a/activesupport/lib/active_support/core_ext/array/conversions.rb +++ b/activesupport/lib/active_support/core_ext/array/conversions.rb @@ -10,10 +10,7 @@ module ActiveSupport #:nodoc: def to_sentence(options = {}) options.assert_valid_keys(:connector, :skip_last_comma, :locale) - locale = options[:locale] - locale ||= self.locale if respond_to?(:locale) - - default = I18n.translate(:'support.array.sentence_connector', locale) + default = I18n.translate(:'support.array.sentence_connector', :locale => options[:locale]) options.reverse_merge! :connector => default, :skip_last_comma => false options[:connector] = "#{options[:connector]} " unless options[:connector].nil? || options[:connector].strip == '' diff --git a/activesupport/lib/active_support/vendor/i18n-0.0.1 b/activesupport/lib/active_support/vendor/i18n-0.0.1 -Subproject 970bc7ab5faa94e41ee4a56bc8913c144c1cdd1 +Subproject 46aad289935eaf059c429acb5f3bfa0946f2d99 |