xxx_active_code_live setting in printed in hours and minutes instead … (#1814)

* xxx_active_code_live setting in printed in hours and minutes instead of just hours

* Update app.ini description of xxx_code_lives settings

modules/base/tool.go

@@ -277,6 +277,13 @@ func computeTimeDiff(diff int64) (int64, string) {
 	return diff, diffStr
 }
 
+// MinutesToFriendly returns a user friendly string with number of minutes
+// converted to hours and minutes.
+func MinutesToFriendly(minutes int) string {
+	duration := time.Duration(minutes) * time.Minute
+	return TimeSincePro(time.Now().Add(-duration))
+}
+
 // TimeSincePro calculates the time interval and generate full user-friendly string.
 func TimeSincePro(then time.Time) string {
 	return timeSincePro(then, time.Now())

modules/base/tool_test.go

@@ -167,6 +167,20 @@ func TestComputeTimeDiff(t *testing.T) {
 	test(3*Year, "3 years", 0, Year-1)
 }
 
+func TestMinutesToFriendly(t *testing.T) {
+	// test that a number of minutes yields the expected string
+	test := func(expected string, minutes int) {
+		actual := MinutesToFriendly(minutes)
+		assert.Equal(t, expected, actual)
+	}
+	test("1 minute", 1)
+	test("2 minutes", 2)
+	test("1 hour", 60)
+	test("1 hour, 1 minute", 61)
+	test("1 hour, 2 minutes", 62)
+	test("2 hours", 120)
+}
+
 func TestTimeSince(t *testing.T) {
 	assert.Equal(t, "now", timeSince(BaseDate, BaseDate, "en"))