application_schedule.rb in naf-2.1.6

- old
+ new

@@ -128,11 +128,11 @@
         output = ''
         time = schedule.run_interval
         if schedule.run_interval_style.name == 'at beginning of day'
           output = exact_time_of_day(time)
         else
-          output = interval_time2(time)
+          output = interval_time(time)
         end
 
         output
       end
 
@@ -145,24 +145,14 @@
         output = Time.parse(output).strftime('%I:%M %p')
 
         return output
       end
 
-      def interval_time2(time)
+      def interval_time(time)
         if time < 9
           ":0#{time}"
         else
           ":#{time}"
-        end
-      end
-
-      def interval_time(time)
-        if time < 60
-          pluralize(time, 'minute')
-        elsif time % 60 == 0
-          pluralize(time / 60, 'hour')
-        else
-          pluralize(time / 60, 'hour') + ', ' + pluralize(time % 60, 'minute')
         end
       end
 
       def application_run_group_name
         if schedule.application_run_group_name.present?