Removed dirty fix for handling timezones since the core sets timezones correctly,

added showing timezones so the user know the timezones used

app/controllers/meetings_controller.rb

@@ -49,7 +49,7 @@ class MeetingsController < ApplicationController
     if @meeting.save
       text = l(:notice_successful_create)
       if User.current.time_zone.nil?
-        link = l(:notice_timezone_missing, :zone => Time.now.zone)
+        link = l(:notice_timezone_missing, :zone => Time.zone)
         text += " #{view_context.link_to(link, {:controller => :my, :action => :account},:class => "link_to_profile")}"
       end
       flash[:notice] = text.html_safe
@@ -112,13 +112,7 @@ class MeetingsController < ApplicationController
     start_time_5i = params[:meeting].delete(:"start_time(5i)")
     begin
       timestring = "#{start_date} #{start_time_4i}:#{start_time_5i}"
-      if(User.current.time_zone.nil?)
-        time = Time.parse(timestring) #using the system time zone
-      else
-        Time.use_zone(User.current.time_zone) do
-          time = Time.zone.parse(timestring) #using the user-set time zone
-        end
-      end
+      time = Time.zone.parse(timestring)
       params[:meeting][:start_time] = time
     rescue ArgumentError
       params[:meeting][:start_time] = nil

app/views/meetings/_form.html.erb

@@ -3,7 +3,7 @@
 <div class="box tabular">
   <p><%= f.text_field :title, :required => true, :size => 60, :class => "autofocus" %></p>
   <p><%= f.text_field :location, :size => 60 %></p>
-  <p><%= f.text_field :start_date, :required => true, :size => 10 %><%= calendar_for('meeting_start_date') %> <%= time_select "meeting", "start_time", :ignore_date => true, :minute_step => 5 %></p>
+  <p><%= f.text_field :start_date, :required => true, :size => 10 %><%= calendar_for('meeting_start_date') %> <%= time_select "meeting", "start_time", :ignore_date => true, :minute_step => 5 %> <%= Time.zone %></p>
   <p><%= f.text_field :duration, :required => true, :size => 5 %><em>(<%=l :text_in_hours %>)</em>
   <div><label><%=l :field_participants %></label>
     <table class="list">

app/views/meetings/show.html.erb

@@ -11,7 +11,7 @@
   <%= avatar(@meeting.author, :size => "64") %>
   <p class="author"><%= authoring @meeting.created_at, @meeting.author %></p>
   <div class="splitcontentleft">
-  <p><strong><%= l(:field_start_time) %></strong>: <%= format_date @meeting.start_date %> <%= format_time @meeting.start_time, false %> - <%= format_time @meeting.end_time, false %></p>
+  <p><strong><%= l(:field_start_time) %></strong>: <%= format_date @meeting.start_date %> <%= format_time @meeting.start_time, false %> - <%= format_time @meeting.end_time, false %> <%= Time.zone %></p>
   </div>
   <div class="splitcontentright">
   <p><strong><%= l(:field_location) %></strong>: <%=h @meeting.location %></p>