Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

remove call to self.locale from helpers

  • Loading branch information...
commit c178a87b4326edd491922136c0a55bf4b889473d 1 parent 2ee9f2a
@svenfuchs svenfuchs authored
View
5 actionpack/lib/action_view/helpers/active_record_helper.rb
@@ -159,9 +159,6 @@ def error_messages_for(*params)
end
count = objects.inject(0) {|sum, object| sum + object.errors.count }
- locale = options[:locale]
- locale ||= self.locale if respond_to?(:locale)
-
unless count.zero?
html = {}
[:id, :class].each do |key|
@@ -174,7 +171,7 @@ def error_messages_for(*params)
end
options[:object_name] ||= params.first
- I18n.with_options :locale => locale, :scope => [:active_record, :error] do |locale|
+ I18n.with_options :locale => options[:locale], :scope => [:active_record, :error] do |locale|
header_message = if options.include?(:header_message)
options[:header_message]
else
View
5 actionpack/lib/action_view/helpers/date_helper.rb
@@ -59,15 +59,12 @@ module DateHelper
# distance_of_time_in_words(Time.now, Time.now) # => less than a minute
#
def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false, options = {})
- locale = options[:locale]
- locale ||= self.locale if respond_to?(:locale)
-
from_time = from_time.to_time if from_time.respond_to?(:to_time)
to_time = to_time.to_time if to_time.respond_to?(:to_time)
distance_in_minutes = (((to_time - from_time).abs)/60).round
distance_in_seconds = ((to_time - from_time).abs).round
- I18n.with_options :locale => locale, :scope => :'datetime.distance_in_words' do |locale|
+ I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do |locale|
case distance_in_minutes
when 0..1
return distance_in_minutes == 0 ?
View
9 actionpack/lib/action_view/helpers/number_helper.rb
@@ -69,12 +69,9 @@ def number_to_phone(number, options = {})
# number_to_currency(1234567890.50, :unit => "£", :separator => ",", :delimiter => "", :format => "%n %u")
# # => 1234567890,50 £
def number_to_currency(number, options = {})
- options = options.symbolize_keys
-
- locale = options[:locale]
- locale ||= self.locale if respond_to?(:locale)
-
- defaults = :'currency.format'.t(locale) || {}
+ options = options.symbolize_keys
+ defaults = :'currency.format'.t(options[:locale]) || {}
+
precision = options[:precision] || defaults[:precision]
unit = options[:unit] || defaults[:unit]
separator = options[:separator] || defaults[:separator]
Please sign in to comment.
Something went wrong with that request. Please try again.