Merge pull-request #615

2 files changed, 27 insertions, 2 deletions

diff --git a/app/Template/board/task.php b/app/Template/board/task.php
index 41bde065..075eab92 100644
--- a/app/Template/board/task.php
+++ b/app/Template/board/task.php
@@ -69,8 +69,8 @@
         ) ?>
     </span>
     
-    <span title="<?= t('Task age in days')?>" class="task-days-age"><?= t('%dd', floor(time()/86400) - floor($task['date_creation']/86400)) ?></span>
-    <span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= t('%dd', floor(time()/86400) - floor($task['date_moved']/86400)) ?></span>
+    <span title="<?= t('Task age in days')?>" class="task-days-age"><?= getAgeShort ($task['date_creation']) ?></span>
+    <span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= getAgeShort ($task['date_moved']) ?></span>
     
     <?php if ($task['score']): ?>
         <span class="task-score"><?= $this->e($task['score']) ?></span>
diff --git a/app/functions.php b/app/functions.php
index d45e78e7..a748f005 100644
--- a/app/functions.php
+++ b/app/functions.php
@@ -66,3 +66,28 @@ function dt($format, $timestamp)
 function p($value, $t1, $t2) {
     return $value > 1 ? $t2 : $t1;
 }
+
+/**
+ * Get the age of an item in quasi human readable format.
+ * It's in this format: <1h , NNh, NNd
+ *
+ * @access public
+ * @param int $time
+ *        	Unix timestamp of the artifact for which age will be calculated
+ * @param int $currenttime
+ *        	Comepare with timestamp. Default current unix timestamp
+ * @return string
+ */
+function getAgeShort($time, $currenttime = NULL) {
+	if (! $currenttime) {
+		$currenttime = time ();
+	}
+	$diff = $currenttime - $time;
+
+	if ($diff < 3600)
+		return "<1h";
+	elseif ($diff < 86400) {
+		return intval ( ($diff / 3600) ) . "h";
+	}
+	return intval ( ((floor ( $currenttime ) - floor ( $time )) / 86400) ) . "d";
+}