fix ReportingHelper definition of l()

pull/6827/head
Tim Felgentreff 13 years ago
parent 089678871f
commit 1d05c873e8
  1. 9
      app/helpers/reporting_helper.rb

@ -6,13 +6,14 @@ module ReportingHelper
# include QueriesHelper # include QueriesHelper
include ApplicationHelper include ApplicationHelper
# Extends the definition in ApplicationHelper, to allow passing Dates as well
# This is the definitions that is hit by the views and widgets
def l(*values) def l(*values)
return values.first if values.size == 1 and values.first.respond_to? :to_str return values.first if values.size == 1 and values.first.respond_to? :to_str
symbol_or_date = values.first if [Date, DateTime, Time].include? values.first.class
if [Date, DateTime, Time].include? symbol_or_date.class ::I18n.l values.first
::I18n.l symbol_or_date
else else
::I18n.t symbol_or_date.to_sym, :default => symbol_or_date.to_s.humanize ApplicationHelper.l(*values)
end end
end end

Loading…
Cancel
Save