only show comma after if the next numerical value is greater than 0

This commit is contained in:
Squibid 2025-11-09 23:32:48 -05:00
parent 7a26969f30
commit 48e7f34efb
Signed by: squibid
GPG key ID: BECE5684D3C4005D

View file

@ -22,10 +22,37 @@ pub fn secs_to_time(secs: u64) ![]const u8 {
const minutes = seconds / minute; const minutes = seconds / minute;
seconds = seconds % minute; seconds = seconds % minute;
if (weeks > 0) try writer.print("{} {s}{s}, ", .{weeks, "week", if (weeks > 1) "s" else ""}); if (weeks > 0) {
if (days > 0) try writer.print("{} {s}{s}, ", .{days, "day", if (days > 1) "s" else ""}); try writer.print("{} {s}{s}{s}", .{
if (hours > 0) try writer.print("{} {s}{s}, ", .{hours, "hour", if (hours > 1) "s" else ""}); weeks,
if (minutes > 0) try writer.print("{} {s}{s}", .{minutes, "minute", if (minutes > 1) "s" else ""}); "week",
if (weeks > 1) "s" else "",
if (days > 0) ", " else "",
});
}
if (days > 0) {
try writer.print("{} {s}{s}{s}", .{
days,
"day",
if (days > 1) "s" else "",
if (hours > 0) ", " else "",
});
}
if (hours > 0) {
try writer.print("{} {s}{s}{s}", .{
hours,
"hour",
if (hours > 1) "s" else "",
if (minutes > 0) ", " else "",
});
}
if (minutes > 0) {
try writer.print("{} {s}{s}", .{
minutes,
"minute",
if (minutes > 1) "s" else "",
});
}
if (weeks == 0 and days == 0 and hours == 0 and minutes == 0) { if (weeks == 0 and days == 0 and hours == 0 and minutes == 0) {
try writer.print("{} {s}{s}", .{seconds, "second", if (seconds > 1) "s" else ""}); try writer.print("{} {s}{s}", .{seconds, "second", if (seconds > 1) "s" else ""});