From 75afba540d649d46295160ab8c65dcd30ec6e4c3 Mon Sep 17 00:00:00 2001 From: JinHoooooou Date: Tue, 19 May 2020 20:12:41 +0900 Subject: [PATCH] 2020-05-19-Human-Readable-Duration-Format-add-actual-code-for-passing-fourth-test --- .../TimeFormatter.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/humanReadableDurationFormat_20200519/TimeFormatter.java b/src/humanReadableDurationFormat_20200519/TimeFormatter.java index 41f1b603..ec4f99e9 100644 --- a/src/humanReadableDurationFormat_20200519/TimeFormatter.java +++ b/src/humanReadableDurationFormat_20200519/TimeFormatter.java @@ -4,8 +4,10 @@ public class TimeFormatter { public static String formatDuration(int seconds) { String result = ""; + int hour = seconds / 3600; + int minute = seconds % 3600 / 60; int second = seconds % 60; - int minute = seconds / 60; + if (second > 0) { result = second + (second > 1 ? " seconds" : " second"); } @@ -15,6 +17,12 @@ public static String formatDuration(int seconds) { } result = minute + (minute > 1 ? " minutes" : " minute") + result; } + if (hour > 0) { + if (minute > 0 || second > 0) { + result = " and" + result; + } + result = hour + (hour > 1 ? " hours" : " hour") + result; + } return result; }