Merge pull request #253 from duckduckgo/duration-units

Use a maximum of 2 units when describing comment / thread age.

lib/DDGC/Util/DateTime.pm

@@ -16,26 +16,25 @@ use DateTime::Format::Human::Duration;
 sub dur {
 	my ( $date ) = @_;
 	$date = DateTime->from_epoch( epoch => $date ) unless ref $date;
+	my $diff = DateTime->now - $date;
+	my $units = [qw/ hours minutes /];
+
+	$units = [qw/ days hours /]    if ($diff->days > 0);
+	$units = [qw/ months days /]   if ($diff->months > 0);
+	$units = [qw/ years /]  if ($diff->years > 0);
+
 	return DateTime::Format::Human::Duration->new->format_duration(
-		DateTime->now - $date,
+		$diff,
+		'units' => $units,
 		'past' => '%s ago',
 		'future' => 'in %s will be',
 		'no_time' => 'just now',
-                'precision' => 'minutes',
-                'significant_units' => 2,
 	);
 }
 
 sub dur_precise {
 	my ( $date ) = @_;
-	$date = DateTime->from_epoch( epoch => $date ) unless ref $date;
-	return DateTime::Format::Human::Duration->new->format_duration(
-		DateTime->now - $date,
-		'units' => [qw/years months days hours minutes/],
-		'past' => '%s ago',
-		'future' => 'in %s will be',
-		'no_time' => 'just now',
-	);
+	dur( $date );
 }
 
 1;