mirror of
https://github.com/github/rails.git
synced 2026-01-28 07:48:00 -05:00
crap, an array never has a request, stupid.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user