Refs #1531: Added full time and dates to friendly time stamptes via acronym tags.

git-svn-id: http://code.elgg.org/elgg/trunk@3957 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 43dba4a433634a6caf7580f62b5c2edefb81c194..09940082ccdbe82cbff3bab37ba18e552a9baafe 100644 (file)
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1234,29 +1234,32 @@ function friendly_time($time) {
                        $diff = 1;
                }
                if ($diff > 1) {
-                       return sprintf(elgg_echo("friendlytime:minutes"),$diff);
+                       $friendly_time = sprintf(elgg_echo("friendlytime:minutes"), $diff);
                }
-               return sprintf(elgg_echo("friendlytime:minutes:singular"),$diff);
+               $friendly_time = sprintf(elgg_echo("friendlytime:minutes:singular"), $diff);
        } else if ($diff < 86400) {
                $diff = round($diff / 3600);
                if ($diff == 0) {
                        $diff = 1;
                }
                if ($diff > 1) {
-                       return sprintf(elgg_echo("friendlytime:hours"),$diff);
+                       $friendly_time = sprintf(elgg_echo("friendlytime:hours"), $diff);
                }
-               return sprintf(elgg_echo("friendlytime:hours:singular"),$diff);
+               $friendly_time = sprintf(elgg_echo("friendlytime:hours:singular"), $diff);
        } else {
                $diff = round($diff / 86400);
                if ($diff == 0) {
                        $diff = 1;
                }
                if ($diff > 1) {
-                       return sprintf(elgg_echo("friendlytime:days"),$diff);
+                       $friendly_time = sprintf(elgg_echo("friendlytime:days"), $diff);
                }
 
-               return sprintf(elgg_echo("friendlytime:days:singular"),$diff);
+               $friendly_time = sprintf(elgg_echo("friendlytime:days:singular"), $diff);
        }
+
+       $timestamp = htmlentities(date(elgg_echo('friendlytime:date_format', $time)));
+       return "<acronym title=\"$timestamp\">$friendly_time</acronym>";
 }
 
 /**

diff --git a/languages/en.php b/languages/en.php
index b495c239673264d39a9d1747784d81783dc14992..61929d52786132fa7c8347868f478b4479bce11c 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -677,6 +677,7 @@ Once you have logged in, we highly recommend that you change your password.
        'friendlytime:hours:singular' => "an hour ago",
        'friendlytime:days' => "%s days ago",
        'friendlytime:days:singular' => "yesterday",
+       'friendlytime:date_format' => 'j F Y @ g:ia',
 
        'date:month:01' => 'January %s',
        'date:month:02' => 'February %s',