Add function Display::dateToStringAgoAndLongDate

pull/2487/head
jmontoyaa 9 years ago
parent d71b876ed6
commit 4917d9be7e
  1. 10
      main/glossary/index.php
  2. 17
      main/inc/lib/display.lib.php
  3. 4
      main/inc/lib/message.lib.php

@ -125,19 +125,13 @@ switch ($action) {
// Date treatment for timezones // Date treatment for timezones
if (!empty($glossary_data['insert_date'])) { if (!empty($glossary_data['insert_date'])) {
$glossary_data['insert_date'] = Display::tip( $glossary_data['insert_date'] = Display::dateToStringAgoAndLongDate($glossary_data['insert_date']);
date_to_str_ago($glossary_data['insert_date']),
api_get_local_time($glossary_data['insert_date'])
);
} else { } else {
$glossary_data['insert_date'] = ''; $glossary_data['insert_date'] = '';
} }
if (!empty($glossary_data['update_date'])) { if (!empty($glossary_data['update_date'])) {
$glossary_data['update_date'] = Display::tip( $glossary_data['update_date'] = Display::dateToStringAgoAndLongDate($glossary_data['update_date']);
date_to_str_ago($glossary_data['update_date']),
api_get_local_time($glossary_data['update_date'])
);
} else { } else {
$glossary_data['update_date'] = ''; $glossary_data['update_date'] = '';
} }

@ -2484,4 +2484,21 @@ HTML;
} }
return $html; return $html;
} }
/**
* @param string $dateTime in UTC
*
* @return string
*/
public static function dateToStringAgoAndLongDate($dateTime)
{
if (empty($dateTime) || $dateTime === '0000-00-00 00:00:00') {
return '';
}
return self::tip(
date_to_str_ago($dateTime),
api_get_local_time($dateTime)
);
}
} }

@ -1012,7 +1012,7 @@ class MessageManager
$message_content .= '</div>'; $message_content .= '</div>';
$message_content .= '<div class="col-md-2 col-md-offset-5">'; $message_content .= '<div class="col-md-2 col-md-offset-5">';
$message_content .= Display::tip(date_to_str_ago($row['send_date']), api_get_local_time($row['send_date'])); $message_content .= Display::dateToStringAgoAndLongDate($row['send_date']);
$message_content .= '</div>'; $message_content .= '</div>';
} else { } else {
@ -1025,7 +1025,7 @@ class MessageManager
$message_content .= '</div>'; $message_content .= '</div>';
$message_content .= '<div class="col-md-2 col-md-offset-5">'; $message_content .= '<div class="col-md-2 col-md-offset-5">';
$message_content .= Display::tip(date_to_str_ago($row['send_date']), api_get_local_time($row['send_date'])); $message_content .= Display::dateToStringAgoAndLongDate($row['send_date']);
$message_content .= '</div>'; $message_content .= '</div>';
} }
$message_content .= '</div>'; $message_content .= '</div>';

Loading…
Cancel
Save