diff options
| author | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-06-22 13:49:08 +0200 |
|---|---|---|
| committer | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-06-22 13:49:08 +0200 |
| commit | 67fce4671e8bcfe2aa670a89195b20837546183a (patch) | |
| tree | d0976e1ace34d190209b57160c52b69a102d285d /activesupport | |
| parent | 20d6630c1bb70f09e1f6a135bd3f9d690ad28250 (diff) | |
| download | rails-67fce4671e8bcfe2aa670a89195b20837546183a.tar.gz rails-67fce4671e8bcfe2aa670a89195b20837546183a.tar.bz2 rails-67fce4671e8bcfe2aa670a89195b20837546183a.zip | |
crap, an array never has a request, stupid.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/array/conversions.rb | 2 |
1 files changed, 1 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 08e608d346..80d91a6cbd 100644 --- a/activesupport/lib/active_support/core_ext/array/conversions.rb +++ b/activesupport/lib/active_support/core_ext/array/conversions.rb @@ -11,7 +11,7 @@ module ActiveSupport #:nodoc: options.assert_valid_keys(:connector, :skip_last_comma, :locale) locale = options[:locale] - locale ||= request.locale if respond_to?(:request) + locale ||= self.locale if respond_to?(:locale) default = :'support.array.sentence_connector'.t(locale) options.reverse_merge! :connector => default, :skip_last_comma => false |