Merge pull request #7 from thimios/master

24 hour format support
excid3 · Jun 22, 2013 · 71883b7 · 71883b7
2 parents ef16f1a + 0b63e1b
commit 71883b7
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