Merge pull request #44 from finnlabs/fix/5061_add_label_for_meeting_time_selection

[Fix] 5061 Add label for meeting time selection

app/helpers/message_accessibility_helper.rb

@@ -0,0 +1,44 @@
+#-- encoding: UTF-8
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+module MessageAccessibilityHelper
+  def accessible_time_select(object_name, method, options = {}, html_options = {})
+    labels = ''
+    select = time_select(object_name, method, options, html_options)
+    
+    select_ids = select.scan(/<select id="(?<select_id>\w+)"/)
+    ids_with_label = select_ids.zip([:label_meeting_hour, :label_meeting_minute])
+
+    ids_with_label.each do |iwl|
+      labels += content_tag(:label, l(iwl[1]), :for => iwl[0], :class => 'hidden-for-sighted')
+    end
+
+    (labels + select).html_safe
+  end
+end

app/views/meetings/_form.html.erb

@@ -24,7 +24,7 @@ See doc/COPYRIGHT.md for more details.
 <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 %> <%= Time.zone %></p>
+  <p><%= f.text_field :start_date, :required => true, :size => 10 %><%= calendar_for('meeting_start_date') %> <%= accessible_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><%=Meeting.human_attribute_name(:participants) %></label>
     <table class="list">

config/locales/de.yml

@@ -44,6 +44,9 @@ de:
     meeting_minutes: Protokoll bearbeitet
     meeting_minutes_created: Protokoll erstellt
 
+  label_meeting_hour: "Uhrzeit (Stunde)"
+  label_meeting_minute: "Uhrzeit (Minute)"
+
   label_meeting: "Besprechung"
   label_meeting_plural: "Besprechungen"
   label_meeting_new: "Neue Besprechung"

config/locales/en.yml

@@ -44,6 +44,9 @@ en:
     meeting_minutes: Meeting minutes edited
     meeting_minutes_created: Meeting minutes created
 
+  label_meeting_hour: "Time (hour)"
+  label_meeting_minute: "Time (minute)"
+
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"