From 5590cd007a488642131eeb10cf21056a227881c8 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 12 May 2025 19:26:03 -0700 Subject: [PATCH] Do not display `0 minute` in the uptime if another period unit has value --- src/main/java/rife/render/RenderUtils.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/rife/render/RenderUtils.java b/src/main/java/rife/render/RenderUtils.java index c05f5b9..8dcfdab 100644 --- a/src/main/java/rife/render/RenderUtils.java +++ b/src/main/java/rife/render/RenderUtils.java @@ -596,10 +596,16 @@ public final class RenderUtils { properties.getProperty("hours", " hours "))); } - sb.append(minutes).append(plural(minutes, properties.getProperty("minute", " minute"), - properties.getProperty("minutes", " minutes"))); + if (minutes == 0) { + if (years == 0 && months == 0 && weeks == 0 && days == 0 && hours == 0) { + sb.append(0).append(properties.getProperty("minute", " minute")); + } + } else { + sb.append(minutes).append(plural(minutes, properties.getProperty("minute", " minute"), + properties.getProperty("minutes", " minutes"))); + } - return sb.toString(); + return sb.toString().trim(); } /**