提交 c178a87b 编写于 作者: S Sven Fuchs

remove call to self.locale from helpers

上级 2ee9f2a0
...@@ -159,9 +159,6 @@ def error_messages_for(*params) ...@@ -159,9 +159,6 @@ def error_messages_for(*params)
end end
count = objects.inject(0) {|sum, object| sum + object.errors.count } count = objects.inject(0) {|sum, object| sum + object.errors.count }
locale = options[:locale]
locale ||= self.locale if respond_to?(:locale)
unless count.zero? unless count.zero?
html = {} html = {}
[:id, :class].each do |key| [:id, :class].each do |key|
...@@ -174,7 +171,7 @@ def error_messages_for(*params) ...@@ -174,7 +171,7 @@ def error_messages_for(*params)
end end
options[:object_name] ||= params.first 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) header_message = if options.include?(:header_message)
options[:header_message] options[:header_message]
else else
......
...@@ -59,15 +59,12 @@ module DateHelper ...@@ -59,15 +59,12 @@ module DateHelper
# distance_of_time_in_words(Time.now, Time.now) # => less than a minute # 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 = {}) 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) 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) 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_minutes = (((to_time - from_time).abs)/60).round
distance_in_seconds = ((to_time - from_time).abs).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 case distance_in_minutes
when 0..1 when 0..1
return distance_in_minutes == 0 ? return distance_in_minutes == 0 ?
......
...@@ -69,12 +69,9 @@ def number_to_phone(number, options = {}) ...@@ -69,12 +69,9 @@ def number_to_phone(number, options = {})
# number_to_currency(1234567890.50, :unit => "£", :separator => ",", :delimiter => "", :format => "%n %u") # number_to_currency(1234567890.50, :unit => "£", :separator => ",", :delimiter => "", :format => "%n %u")
# # => 1234567890,50 £ # # => 1234567890,50 £
def number_to_currency(number, options = {}) def number_to_currency(number, options = {})
options = options.symbolize_keys options = options.symbolize_keys
defaults = :'currency.format'.t(options[:locale]) || {}
locale = options[:locale]
locale ||= self.locale if respond_to?(:locale)
defaults = :'currency.format'.t(locale) || {}
precision = options[:precision] || defaults[:precision] precision = options[:precision] || defaults[:precision]
unit = options[:unit] || defaults[:unit] unit = options[:unit] || defaults[:unit]
separator = options[:separator] || defaults[:separator] separator = options[:separator] || defaults[:separator]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册