MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1692 from fabrixxm/desktopnotifications

Browse source 
Desktop notifications
This commit is contained in:
Michael Vogel 2015-06-26 08:45:16 +02:00
commit 6eebfb2e13
14 changed files with 237 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/datetime.php
View file

@ -262,10 +262,12 @@ function relative_date($posted_date,$format = null) {
return t('less than a second ago');
}
/*
$time_append = '';
if ($etime >= 86400) {
$time_append = ' ('.$localtime.')';
}
*/
$a = array( 12 * 30 * 24 * 60 * 60 => array( t('year'), t('years')),
30 * 24 * 60 * 60 => array( t('month'), t('months')),
@ -283,7 +285,7 @@ function relative_date($posted_date,$format = null) {
// translators - e.g. 22 hours ago, 1 minute ago
if(! $format)
$format = t('%1$d %2$s ago');
return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1])).$time_append;
return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1]));
}
}
}}