Skip to content
Snippets Groups Projects
Unverified Commit 7c19892a authored by Peter Rotich's avatar Peter Rotich Committed by GitHub
Browse files

Merge pull request #4452 from aydreeihn/issue/relative-time

Relative Time Fixes:
parents 78597d5a c4ec9a09
No related branches found
Tags v1.10-dpr
No related merge requests found
...@@ -894,17 +894,10 @@ class Format { ...@@ -894,17 +894,10 @@ class Format {
return sprintf($timeDiff >= 0 ? __('%d hours ago') : __('in %d hours'), $absTimeDiff / 3600); return sprintf($timeDiff >= 0 ? __('%d hours ago') : __('in %d hours'), $absTimeDiff / 3600);
} }
// within 2 days
$days2 = 2 * 86400;
if ($absTimeDiff < $days2) {
// XXX: yesterday / tomorrow?
return $absTimeDiff >= 0 ? __('yesterday') : __('tomorrow');
}
// within 29 days // within 29 days
$days29 = 29 * 86400; $days29 = 29 * 86400;
if ($absTimeDiff < $days29) { if ($absTimeDiff < $days29) {
return sprintf($timeDiff >= 0 ? __('%d days ago') : __('in %d days'), $absTimeDiff / 86400); return sprintf($timeDiff >= 0 ? __('%d days ago') : __('in %d days'), round($absTimeDiff / 86400));
} }
// within 60 days // within 60 days
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment