From 3687a2e2d8fcb9b0a6970b414f777a8c894fc160 Mon Sep 17 00:00:00 2001
From: Joern-Ingo Weigert <jiweigert@gmail.com>
Date: Fri, 8 Mar 2013 16:46:11 +0100
Subject: [PATCH] Create more beautiful output for the age function.

---
 config/cfgroot/general-functions.pl | 49 ++++++++++++++++++++++++++++-
 langs/de/cgi-bin/de.pl              |  5 +++
 langs/en/cgi-bin/en.pl              |  5 +++
 3 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index f94cdbf16..a70f2673e 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -144,6 +144,10 @@ sub age
 	my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size,
 	        $atime, $mtime, $ctime, $blksize, $blocks) = stat $_[0];
 	my $now = time;
+	my $timestring = '';
+	my $dset = 0;		# Day is set, when > 0
+	my $hset = 0;		# Hour is set, when > 0
+	my $mset = 0;		# Minute is set, when > 0
 
 	my $totalsecs = $now - $mtime;
 	my $days = int($totalsecs / 86400);
@@ -153,7 +157,50 @@ sub age
 	my $mins = $totalmins % 60;
 	my $secs = $totalsecs % 60;
 
-	return "${days}d ${hours}h ${mins}m ${secs}s";
+	if	($days > 1) { 
+		${timestring} .= ${days}.' '.$Lang::tr{'days'}.', ';
+		$dset = 1; 
+	}
+	elsif	($days == 1) { 
+		${timestring} .= ${days}.' '.$Lang::tr{'day'}.', ';
+		$dset = 1; 
+	}
+
+	if	(($hours > 1) && !($dset)) { 
+		${timestring} .= ${hours}.' '.$Lang::tr{'hours'}.', ';
+		$hset = 1;
+	}
+	elsif	(($hours == 1) && !($dset)) { 
+		${timestring} .= ${hours}.' '.$Lang::tr{'hour'}.', ';
+		$hset = 1;
+	}
+	elsif ($dset) {
+		${timestring} .= ${hours}.' '.$Lang::tr{'age shour'}.', ';
+		$hset = 1;
+	}
+
+	if	((($mins > 1) || ($mins == 0)) && !($dset || $hset)) { 
+		${timestring} .= ${mins}.' '.$Lang::tr{'minutes'}.', ';
+		$mset = 1;
+	}
+	elsif	(($mins == 1) && !($dset || $hset)) { 
+		${timestring} .= ${mins}.' '.$Lang::tr{'minute'}.', ';
+		$mset = 1;
+	}
+	else {
+		${timestring} .= ${mins}.' '.$Lang::tr{'age sminute'}.', '; 
+		$mset = 1;
+	}
+
+	if	((($secs > 1) || ($secs == 0)) && !($dset || $hset || $mset)) { 
+		${timestring} .= ${secs}.' '.$Lang::tr{'age seconds'};
+	}
+	elsif	(($secs == 1) && !($dset || $hset || $mset)) { 
+		${timestring} .= $secs.' '.$Lang::tr{'age second'};
+	}
+	else	{ ${timestring} .= $secs.' '.$Lang::tr{'age ssecond'}; }
+
+	return ${timestring};
 }
 
 sub validip
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 41e044089..aaf4d27ee 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -6,6 +6,11 @@
 'Add Port Rule' => 'Port-Regel hinzufügen',
 'Add Rule' => 'Regel hinzufügen',
 'Add a route' => 'Eine Route hinzufügen',
+'age smin' => 'Min.',
+'age ssec' => 'Sek.',
+'age second' => 'Sekunde',
+'age seconds' => 'Sekunden',
+'age shour' => 'Std.',
 'Async logging enabled' => 'Aktiviere asynchrones Schreiben des Syslogs',
 'Choose Rule' => 'Wählen Sie <u>eine</u> der untenstehenden Regeln aus.',
 'Class' => 'Klasse',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index b1d614e02..729f30943 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -6,6 +6,11 @@
 'Add Port Rule' => 'Add port rule',
 'Add Rule' => 'Add rule',
 'Add a route' => 'Add a route',
+'age smin' => 'min',
+'age ssec' => 'sec',
+'age second' => 'second',
+'age seconds' => 'seconds',
+'age shour' => 'h',
 'Async logging enabled' => 'Enable asynchronous writing of the syslog file',
 'Choose Rule' => 'Choose <u>one</u> of the following rules.',
 'Class' => 'Class',
-- 
2.39.2