Merge remote-tracking branch 'friendika-master/master' into iconpopup

2011-04-04 09:31:12 +02:00
parent b48e82d12a 9b50b0e16f
commit 92156cd840
21 changed files with 401 additions and 130 deletions
--- a/mod/message.php
+++ b/mod/message.php
@@ -237,7 +237,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);