Merge remote-tracking branch 'upstream/develop' into 1509-new-feed-import

[friendica.git] / include / datetime.php

diff --git a/include/datetime.php b/include/datetime.php
index 8ac8ff0f297a15100d1c41dea65652e8b15a3007..6461298ba2f155cc24db192554d6120c5e1dd2f9 100644 (file)
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -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]));
         }
     }
 }}