From 4ad1ebce249519369d24b4ea7da1da62a685627a Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 23 Nov 2012 12:01:47 -0500 Subject: [PATCH] Mostly functional Gitblit Certificate Authority tool --- src/com/gitblit/utils/TimeUtils.java | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/com/gitblit/utils/TimeUtils.java b/src/com/gitblit/utils/TimeUtils.java index 7f69562..ec8871c 100644 --- a/src/com/gitblit/utils/TimeUtils.java +++ b/src/com/gitblit/utils/TimeUtils.java @@ -268,6 +268,22 @@ } } + public String inFuture(Date date) { + long diff = date.getTime() - System.currentTimeMillis(); + if (diff > ONEDAY) { + double days = ((double) diff)/ONEDAY; + return translate((int) Math.round(days), "gb.time.inDays", "in {0} days"); + } else { + double hours = ((double) diff)/ONEHOUR; + if (hours > 2) { + return translate((int) Math.round(hours), "gb.time.inHours", "in {0} hours"); + } else { + int mins = (int) (diff/MIN); + return translate(mins, "gb.time.inMinutes", "in {0} minutes"); + } + } + } + private String translate(String key, String defaultValue) { String value = defaultValue; if (translation != null && translation.containsKey(key)) { -- Gitblit v1.9.1