diff --git a/app/controllers/schedules_controller.rb b/app/controllers/schedules_controller.rb index 864f0f3..53e7b78 100644 --- a/app/controllers/schedules_controller.rb +++ b/app/controllers/schedules_controller.rb @@ -120,7 +120,7 @@ def estimate # Build issue precedence hierarchy floating_issues = Set.new # Issues with no children or parents surfaced_issues = Set.new # Issues with children, but no parents - buried_issues = Set.new # Issues with parents + buried_issues = Set.new # Issues with parents @open_issues.each do |issue_id, issue| issue.start_date = nil issue.due_date = nil diff --git a/app/helpers/schedules_helper.rb b/app/helpers/schedules_helper.rb old mode 100755 new mode 100644 diff --git a/app/models/schedule_closed_entry.rb b/app/models/schedule_closed_entry.rb old mode 100755 new mode 100644 diff --git a/app/models/schedule_default.rb b/app/models/schedule_default.rb old mode 100755 new mode 100644 diff --git a/app/models/schedule_entry.rb b/app/models/schedule_entry.rb old mode 100755 new mode 100644 diff --git a/app/views/my/blocks/_my_schedule.html.erb b/app/views/my/blocks/_my_schedule.html.erb old mode 100755 new mode 100644 diff --git a/app/views/schedules/_availability.html.erb b/app/views/schedules/_availability.html.erb old mode 100755 new mode 100644 diff --git a/app/views/schedules/_calendar.html.erb b/app/views/schedules/_calendar.html.erb old mode 100755 new mode 100644 index b36a22a..b45ef19 --- a/app/views/schedules/_calendar.html.erb +++ b/app/views/schedules/_calendar.html.erb @@ -36,7 +36,7 @@ <% sum = entries_by_day[day].nil? ? 0 : entries_by_day[day].collect(&:hours).sum %> <%= sum if sum > 0 %> <% available_sum = @availabilities[day].nil? ? 0 : @availabilities[day].collect { |user, hours| hours }.sum %> - <%= "("+available_sum.to_s+" available)" if available_sum > 0 %> + <%= "(#{available_sum.to_s} #{l(:label_schedules_available).downcase})" if available_sum > 0 %> <% end %> diff --git a/app/views/schedules/_project.html.erb b/app/views/schedules/_project.html.erb old mode 100755 new mode 100644 diff --git a/app/views/schedules/_sidebar.html.erb b/app/views/schedules/_sidebar.html.erb old mode 100755 new mode 100644 diff --git a/app/views/schedules/_user.html.erb b/app/views/schedules/_user.html.erb old mode 100755 new mode 100644 diff --git a/app/views/schedules/default.html.erb b/app/views/schedules/default.html.erb old mode 100755 new mode 100644 diff --git a/app/views/schedules/details.html.erb b/app/views/schedules/details.html.erb old mode 100755 new mode 100644 diff --git a/app/views/schedules/estimate.html.erb b/app/views/schedules/estimate.html.erb old mode 100755 new mode 100644 diff --git a/app/views/schedules/index.html.erb b/app/views/schedules/index.html.erb old mode 100755 new mode 100644 diff --git a/app/views/schedules/report.html.erb b/app/views/schedules/report.html.erb old mode 100755 new mode 100644 diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb old mode 100755 new mode 100644 diff --git a/assets/javascripts/schedules_edit.js b/assets/javascripts/schedules_edit.js old mode 100755 new mode 100644 diff --git a/assets/stylesheets/schedules.css b/assets/stylesheets/schedules.css old mode 100755 new mode 100644 diff --git a/db/migrate/003_create_schedule_default.rb b/db/migrate/003_create_schedule_default.rb old mode 100755 new mode 100644 diff --git a/init.rb b/init.rb old mode 100755 new mode 100644