lib/makit/humanize.rb in makit-0.0.37 vs lib/makit/humanize.rb in makit-0.0.38

@@ -89,24 +89,41 @@
       minutes = ((total_seconds % 3600) / 60).to_i
       seconds = (total_seconds % 60).round(2)
       "#{hours}h #{minutes}m #{seconds}s"
     end
 
-    def self.get_humanized_duration(seconds)
-      minutes = (seconds / 60).to_i
-      seconds = (seconds % 60).to_i
+    def self.get_humanized_duration(seconds_value)
+      minutes = (seconds_value / 60).to_i
+      seconds = (seconds_value % 60).to_i
       hours = (minutes / 60).to_i
       minutes = minutes % 60
       days = (hours / 24).to_i
       hours = hours % 24
-      milliseconds = (seconds % 1 * 1000).to_i
+      milliseconds = (seconds_value % 1 * 1000).to_i
 
       parts = []
       parts << "#{days} days" if days > 0
       parts << "#{hours} hours" if hours > 0
-      parts << "#{minutes} minutes" if minutes > 0
-      parts << "#{seconds} seconds" if seconds > 0
+      if(minutes > 0)
+        if(minutes == 1)
+          parts << "1 minute"
+        else
+          parts << "#{minutes} minutes"
+        end
+      end
+      if(seconds > 0)
+        if(seconds == 1)
+          parts << "1 second"
+        else
+          parts << "#{seconds} seconds"
+        end
+      end
+      #parts << "#{seconds} seconds" if seconds > 0
       parts << "#{milliseconds} milliseconds" if milliseconds > 0 && seconds < 1
+
+      if(parts.length == 0)
+        parts << "0 seconds"
+      end
       parts.join(", ")
     end
   end
 end