Merge branch 'release/6.0' into dev

app/controllers/meetings_controller.rb

@@ -81,6 +81,10 @@ class MeetingsController < ApplicationController
   def new
   end
 
+  current_menu_item :new do
+    :meetings
+  end
+
   def copy
     params[:copied_from_meeting_id] = @meeting.id
     params[:copied_meeting_agenda_text] = @meeting.agenda.text if @meeting.agenda.present?

app/services/meeting_notification_service.rb

@@ -25,7 +25,7 @@ class MeetingNotificationService
         MeetingMailer.send(action, content, content_type, recipient.mail).deliver_now
       rescue => e
         Rails.logger.error {
-          "Failed to deliver icalendar notification to #{recipient.login}: #{e.message}"
+          "Failed to deliver #{action} notification to #{recipient.mail}: #{e.message}"
         }
         recipients_with_errors << recipient
       end

app/views/meeting_mailer/content_for_review.html.erb

@@ -23,7 +23,7 @@ See doc/COPYRIGHT.md for more details.
 <em><%= @meeting.author %></em>
 
 <ul>
-<li><%=t :label_meeting_date_time %>: <%= format_date @meeting.start_date %> <%= format_time @meeting.start_time, false %>-<%= format_time @meeting.end_time, false %> <%= Time.zone %></li>
+<li><%=t :label_meeting_date_time %>: <%= format_date @meeting.start_time %> <%= format_time @meeting.start_time, false %>-<%= format_time @meeting.end_time, false %> <%= Time.zone %></li>
 <li><%=Meeting.human_attribute_name(:location) %>: <%= @meeting.location %></li>
 <li><%=Meeting.human_attribute_name(:participants_invited) %>: <%= @meeting.participants.invited.sort.join("; ") %></li>
 <li><%=Meeting.human_attribute_name(:participants_attended) %>: <%= @meeting.participants.attended.sort.join("; ") %></li>

app/views/meeting_mailer/content_for_review.text.erb

@@ -22,7 +22,7 @@ See doc/COPYRIGHT.md for more details.
 <%= @meeting.project.name %>: <%= @meeting.title %> (<%= meeting_url(@meeting) %>)
 <%= @meeting.author %>
 
-<%=t :label_meeting_date_time %>: <%= format_date @meeting.start_date %> <%= format_time @meeting.start_time, false %>-<%= format_time @meeting.end_time, false %> <%= Time.zone %>
+<%=t :label_meeting_date_time %>: <%= format_date @meeting.start_time %> <%= format_time @meeting.start_time, false %>-<%= format_time @meeting.end_time, false %> <%= Time.zone %>
 <%= Meeting.human_attribute_name(:location) %>: <%= @meeting.location %>
 <%= Meeting.human_attribute_name(:participants_invited) %>: <%= @meeting.participants.invited.sort.join("; ") %>
 <%= Meeting.human_attribute_name(:participants_attended) %>: <%= @meeting.participants.attended.sort.join("; ") %>

app/views/meetings/index.html.erb

@@ -36,7 +36,7 @@ See doc/COPYRIGHT.md for more details.
 <div class="meetings meetings_by_month_year" id="activity">
 <% @meetings_by_start_year_month_date.each do |year,meetings_by_start_month_date| -%>
 <% meetings_by_start_month_date.each do |month,meetings_by_start_date| -%>
-  <h3 class="month_year"><%= "#{month_name(month)} #{year}" %></h3>
+  <h3 class="month_year"><%= ::I18n.t('date.month_names')[month] + " #{year}" %></h3>
   <div class="meetings_by_date">
   <% meetings_by_start_date.each do |date,meetings| -%>
     <h4 id="<%= date.strftime("%m-%d-%Y") %>" class="date"><%= format_activity_day(date) %></h4>