--- redmine/app/helpers/timelog_helper.rb.old 2011-05-17 09:08:24.932808153 +0200 +++ redmine/app/helpers/timelog_helper.rb 2011-05-17 09:12:48.182807069 +0200 @@ -139,6 +139,8 @@ end def report_to_csv(criterias, periods, hours) + decimal_separator = l(:general_csv_decimal_separator) + export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv| # Column headers headers = criterias.collect {|criteria| l(@available_criterias[criteria][:label]) } @@ -153,15 +155,17 @@ periods.each do |period| sum = sum_hours(select_hours(hours, @columns, period.to_s)) total += sum - row << (sum > 0 ? "%.2f" % sum : '') + row << (sum > 0 ? ("%.2f" % sum).gsub('.',decimal_separator) : '') end - row << "%.2f" %total + row << ("%.2f" %total).gsub('.',decimal_separator) csv << row end export end def report_criteria_to_csv(csv, criterias, periods, hours, level=0) + decimal_separator = l(:general_csv_decimal_separator) + hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value| hours_for_value = select_hours(hours, criterias[level], value) next if hours_for_value.empty? @@ -172,9 +176,9 @@ periods.each do |period| sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s)) total += sum - row << (sum > 0 ? "%.2f" % sum : '') + row << (sum > 0 ? ("%.2f" % sum).gsub('.',decimal_separator) : '') end - row << "%.2f" %total + row << ("%.2f" %total).gsub('.',decimal_separator) csv << row if criterias.length > level + 1