mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix future time spans 

Signed-off-by: dartcafe <github@dartcafe.de>
This commit is contained in:
dartcafe 2017-10-22 07:52:28 +02:00
parent 4ac77b891c
commit 9c08e3a4a6
No known key found for this signature in database
GPG Key ID: CCE73CEF3035D3C8
1 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib/private/DateTimeFormatter.php
View File

@ -159,17 +159,41 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
if ($dateInterval->y == 0 && $dateInterval->m == 0 && $dateInterval->d == 0) {
return (string) $l->t('today');
} else if ($dateInterval->y == 0 && $dateInterval->m == 0 && $dateInterval->d == 1) {
return (string) $l->t('yesterday');
if ($timestamp > $baseTimestamp) {
return (string) $l->t('tomorrow');
} else {
return (string) $l->t('yesterday');
}
} else if ($dateInterval->y == 0 && $dateInterval->m == 0) {
return (string) $l->n('%n day ago', '%n days ago', $dateInterval->d);
if ($timestamp > $baseTimestamp) {
return (string) $l->n('in %n day', 'in %n days', $dateInterval->d);
} else {
return (string) $l->n('%n day ago', '%n days ago', $dateInterval->d);
}
} else if ($dateInterval->y == 0 && $dateInterval->m == 1) {
return (string) $l->t('last month');
if ($timestamp > $baseTimestamp) {
return (string) $l->t('next month');
} else {
return (string) $l->t('last month');
}
} else if ($dateInterval->y == 0) {
return (string) $l->n('%n month ago', '%n months ago', $dateInterval->m);
if ($timestamp > $baseTimestamp) {
return (string) $l->n('in %n month', 'in %n months', $dateInterval->m);
} else {
return (string) $l->n('%n month ago', '%n months ago', $dateInterval->m);
}
} else if ($dateInterval->y == 1) {
return (string) $l->t('last year');
if ($timestamp > $baseTimestamp) {
return (string) $l->t('next year');
} else {
return (string) $l->t('last year');
}
}
if ($timestamp > $baseTimestamp) {
return (string) $l->n('in %n year', 'in %n years', $dateInterval->y);
} else {
return (string) $l->n('%n year ago', '%n years ago', $dateInterval->y);
}
return (string) $l->n('%n year ago', '%n years ago', $dateInterval->y);
}
/**
@ -219,11 +243,23 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
}
if ($diff->h > 0) {
return (string) $l->n('%n hour ago', '%n hours ago', $diff->h);
if ($timestamp > $baseTimestamp) {
return (string) $l->n('in %n hour', 'in %n hours', $diff->h);
} else {
return (string) $l->n('%n hour ago', '%n hours ago', $diff->h);
}
} else if ($diff->i > 0) {
return (string) $l->n('%n minute ago', '%n minutes ago', $diff->i);
if ($timestamp > $baseTimestamp) {
return (string) $l->n('in %n minute', 'in %n minutes', $diff->i);
} else {
return (string) $l->n('%n minute ago', '%n minutes ago', $diff->i);
}
}
if ($timestamp > $baseTimestamp) {
return (string) $l->t('in a few seconds');
} else {
return (string) $l->t('seconds ago');
}
return (string) $l->t('seconds ago');
}
/**