comply with the ampm option to also provide 24hour format

excid3 · Jun 21, 2013 · 0b63e1b · 0b63e1b
1 parent ef16f1a
commit 0b63e1b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/combined_time_select.rb b/lib/combined_time_select.rb
@@ -60,9 +60,11 @@ def select_minute_with_simple_time_select
               ampm_hour = ampm_hour(hour)
 
               val = "#{hour_padded}:#{minute_padded}:00"
+
+              option_text = @options[:ampm] ? "#{ampm_hour}:#{minute_padded}#{ampm}" : "#{hour_padded}:#{minute_padded}"
               minute_options << ((val_minutes == minute) ?
-                %(<option value="#{val}" selected="selected">#{ampm_hour}:#{minute_padded}#{ampm}</option>\n) :
-                %(<option value="#{val}">#{ampm_hour}:#{minute_padded}#{ampm}</option>\n)
+                %(<option value="#{val}" selected="selected">#{option_text}</option>\n) :
+                %(<option value="#{val}">#{option_text}</option>\n)
               )
             end
           end