diff options
-rw-r--r-- | boot.php | 6 | ||||
-rw-r--r-- | mod/message.php | 2 |
2 files changed, 3 insertions, 5 deletions
@@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.934' ); +define ( 'FRIENDIKA_VERSION', '2.1.935' ); define ( 'DFRN_PROTOCOL_VERSION', '2.2' ); define ( 'DB_UPDATE_VERSION', 1045 ); @@ -2405,9 +2405,7 @@ function get_birthdays() { if(! local_user()) return $o; - $bd_format = get_config('system','birthday_format'); - if(! $bd_format) - $bd_format = 'g A l F d' ; // 8 AM Friday January 18 + $bd_format = t('g A l F d') ; // 8 AM Friday January 18 $r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event` LEFT JOIN `contact` ON `contact`.`id` = `event`.`cid` diff --git a/mod/message.php b/mod/message.php index 9d30abd66..7978ecaf2 100644 --- a/mod/message.php +++ b/mod/message.php @@ -235,7 +235,7 @@ function message_content(&$a) { '$delete' => t('Delete conversation'), '$body' => $rr['body'], '$to_name' => $rr['name'], - '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'],'D, d M Y - g:i A') + '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')) )); } $o .= paginate($a); |