From dfc4ece4083bbbb98f55291d05e7d2b1513464b7 Mon Sep 17 00:00:00 2001 From: Thomas Pummer <dev@nullpointer.at> Date: Fri, 22 Feb 2013 11:10:11 -0500 Subject: [PATCH] the display-name in web.xml now shows the actual version of Gitblit --- 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