Revert 46 minute threshold

This partially reverts commit 57ccf25.

Using 46 minutes as a threshold proved to be confusing, given
that the human-duration does not use "15 minute" precision
anywhere.

Before this patch, 47 minutes was shown as "About an hour". With this
change, it's shown as "47 minutes".

Addresses moby/moby#38807

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

duration.go

@@ -18,7 +18,7 @@ func HumanDuration(d time.Duration) string {
 		return fmt.Sprintf("%d seconds", seconds)
 	} else if minutes := int(d.Minutes()); minutes == 1 {
 		return "About a minute"
-	} else if minutes < 46 {
+	} else if minutes < 60 {
 		return fmt.Sprintf("%d minutes", minutes)
 	} else if hours := int(d.Hours() + 0.5); hours == 1 {
 		return "About an hour"

duration_test.go

@@ -59,8 +59,8 @@ func TestHumanDuration(t *testing.T) {
 	assertEquals(t, "35 minutes", HumanDuration(35*time.Minute+40*time.Second))
 	assertEquals(t, "45 minutes", HumanDuration(45*time.Minute))
 	assertEquals(t, "45 minutes", HumanDuration(45*time.Minute+40*time.Second))
-	assertEquals(t, "About an hour", HumanDuration(46*time.Minute))
-	assertEquals(t, "About an hour", HumanDuration(59*time.Minute))
+	assertEquals(t, "46 minutes", HumanDuration(46*time.Minute))
+	assertEquals(t, "59 minutes", HumanDuration(59*time.Minute))
 	assertEquals(t, "About an hour", HumanDuration(1*time.Hour))
 	assertEquals(t, "About an hour", HumanDuration(1*time.Hour+29*time.Minute))
 	assertEquals(t, "2 hours", HumanDuration(1*time.Hour+31*time.Minute))