friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

translateable time formats (PM & birthdays)

This commit is contained in:
Friendika 2011-03-31 14:46:16 -07:00
parent 08032e0453
commit d728961cbf
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boot.php
View File

@ -2,7 +2,7 @@
set_time_limit(0); set_time_limit(0);
define ( 'FRIENDIKA_VERSION', '2.1.934' ); define ( 'FRIENDIKA_VERSION', '2.1.935' );
define ( 'DFRN_PROTOCOL_VERSION', '2.2' ); define ( 'DFRN_PROTOCOL_VERSION', '2.2' );
define ( 'DB_UPDATE_VERSION', 1045 ); define ( 'DB_UPDATE_VERSION', 1045 );
@ -2405,9 +2405,7 @@ function get_birthdays() {
if(! local_user()) if(! local_user())
return $o; return $o;
$bd_format = get_config('system','birthday_format'); $bd_format = t('g A l F d') ; // 8 AM Friday January 18
if(! $bd_format)
$bd_format = 'g A l F d' ; // 8 AM Friday January 18
$r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event` $r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
LEFT JOIN `contact` ON `contact`.`id` = `event`.`cid` LEFT JOIN `contact` ON `contact`.`id` = `event`.`cid`

2
mod/message.php
View File

@ -235,7 +235,7 @@ function message_content(&$a) {
'$delete' => t('Delete conversation'), '$delete' => t('Delete conversation'),
'$body' => $rr['body'], '$body' => $rr['body'],
'$to_name' => $rr['name'], '$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); $o .= paginate($a);