Index: rsvp.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/rsvp/rsvp.module,v
retrieving revision 1.6
diff -u -F^f -r1.6 rsvp.module
--- rsvp.module	25 Mar 2005 06:51:25 -0000	1.6
+++ rsvp.module	28 Jun 2005 02:31:38 -0000
@@ -204,7 +204,7 @@ function rsvp_manage($nid = NULL) {
 
     if($node->nid) {
       drupal_set_title(t('Your RSVPs for %event', array('%event' => $node->title)));
-      $title = l($node->title, 'node/'. $node->nid, array('title' => t('view this event'))) .' - '. date("M d, Y", $node->start);
+      $title = l($node->title, 'node/'. $node->nid, array('title' => t('view this event'))) .' - '. format_date($node->event_start, 'small', '', $node->start_offset);
     }
     else {
       drupal_set_message(t('The event associatted with this rsvp has been deleted'));
@@ -232,7 +232,7 @@ function rsvp_manage($nid = NULL) {
   foreach($list as $nid => $rsvps) {
     $node = node_load(array('nid' => $nid));
     if($node->nid) {
-      $content .= theme('item_list', $rsvps, l($node->title, 'node/'. $node->nid, array('title' => t('view this event'))) .' - '. date("M d, Y", $node->start));
+      $content .= theme('item_list', $rsvps, l($node->title, 'node/'. $node->nid, array('title' => t('view this event'))) .' - '. format_date($node->event_start, 'small', '', $node->start_offset));
     }
     else {
       // node has been deleted
@@ -266,7 +266,7 @@ function rsvp_create($nid) {
     default :
       $node = node_load(array("nid" => $nid));
       $content = rsvp_create_form($nid);
-      drupal_set_title(t('Create RSVP for: '). $node->title ." on ". date("M d,  Y", $node->start));
+      drupal_set_title(t('Create RSVP for: %title on %date', array('%title' => $node->title, '%date' => format_date($node->event_start, 'small', '', $node->start_offset))));
       break;
   }
   print theme('page', $content);
@@ -457,8 +457,8 @@ function rsvp_view_invites($nid = NULL) 
       }
 
       if($node) {
-        drupal_set_title(t('Your Invites for: %title on %date', array('%title' => $node->title, '%date' => date("M d,  Y", $node->start))));
-        $title = l($node->title, 'node/'. $node->nid, array('title' => t('view this event'))) .' - '. date("M d, Y", $node->start);
+        drupal_set_title(t('Your Invites for: %title on %date', array('%title' => $node->title, '%date' => format_date($node->event_start, 'small', '', $node->start_offset))));
+        $title = l($node->title, 'node/'. $node->nid, array('title' => t('view this event'))) .' - '. format_date($node->event_start, 'small', '', $node->start_offset);
       }
       else {
         // it's ok if the event is deleted, we just let the user know that
@@ -477,7 +477,7 @@ function rsvp_view_invites($nid = NULL) 
 
     $list = array();
     while ($invite = db_fetch_object($invites)) {
-      $list[$invite->nid][] = l($invite->name, "rsvp/email/". $invite->hash, array('title'=>'view invite'));
+      $list[$invite->nid][] = l($invite->name, "rsvp/email/". $invite->hash, array('title'=> t('view invite')));
     }
 
     if($nid) {
@@ -488,7 +488,7 @@ function rsvp_view_invites($nid = NULL) 
       foreach($list as $nid => $links) {
         $node = node_load(array("nid" => $nid));
         if($node->nid) {
-          $content .= theme('item_list', $links, t('for: ') . l($node->title, 'node/'. $node->nid, array('title' => t('view this event'))) .' - '. date("M d, Y", $node->start));
+          $content .= theme('item_list', $links, t('for: ') . l($node->title, 'node/'. $node->nid, array('title' => t('view this event'))) .' - '. format_date($node->event_start, 'small', '', $node->start_offset));
         }
         else {
           // node has been deleted
@@ -1255,7 +1255,7 @@ function _rsvp_mail($invite) {
   $from = $user->name .' <'. $user->mail .'>';
   $subject = $site ." - ". t('Event Invitation');
   $to = $invite->email;
-  $body = strtr("Hello!\n\nYou have been invited to attend an event by %owner at %site.\n\nYou can view the event itself by following this link: \n%eventurl\n\nYou can view the full invitation by following this link: \n%url", array('%owner'=>$user->name, '%site'=>$site, '%eventurl'=>url("node/$invite->nid", NULL, NULL, 1), '%url'=>url("rsvp/email/$invite->hash", NULL, NULL, 1))) ."\n\nHere is the invitation message:\n$invite->invite_text";
+  $body = t("Hello!\n\nYou have been invited to attend an event by %owner at %site.\n\nYou can view the event itself by following this link: \n%eventurl\n\nYou can view the full invitation by following this link: \n%url\n\nHere is the invitation message:\n", array('%owner'=>$user->name, '%site'=>$site, '%eventurl'=>url("node/$invite->nid", NULL, NULL, 1), '%url'=>url("rsvp/email/$invite->hash", NULL, NULL, 1))) .$invite->invite_text;
   return mail($to, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal (rsvp.module)\nReturn-path: <$from>\nErrors-to: $from\n",$webmaster);
 }
 
@@ -1283,7 +1283,7 @@ function _rsvp_message_rsvp($edit) {
   while($attendee = db_fetch_object($attendees)) {
     $invite = _rsvp_get_invite($attendee->hash);
 
-    $body = strtr("Hello!\n\nYou have been sent a message by %sender at %site.\n\nYou can view the invitation from where it originated by following this link: \n%url", array('%sender'=>$user->name, '%site'=>$site, '%url'=>url("rsvp/email/$invite->hash", NULL, NULL, 1))) ."\n\nHere is the message:\n". $edit['body'];
+    $body = t("Hello!\n\nYou have been sent a message by %sender at %site.\n\nYou can view the invitation from where it originated by following this link: \n%url\n\nHere is the message:\n", array('%sender'=>$user->name, '%site'=>$site, '%url'=>url("rsvp/email/$invite->hash", NULL, NULL, 1))) . $edit['body'];
 
     $to = "$attendee->email <". $attendee->email .'>';
     if(mail($to, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal (rsvp.module)\nReturn-path: <$from>\nErrors-to: $from\n",$webmaster)) {
Index: rsvp.theme
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/rsvp/rsvp.theme,v
retrieving revision 1.1
diff -u -F^f -r1.1 rsvp.theme
--- rsvp.theme	25 Mar 2005 06:51:25 -0000	1.1
+++ rsvp.theme	28 Jun 2005 02:31:39 -0000
@@ -22,7 +22,7 @@ function theme_rsvp_send_status($status)
 
 function theme_rsvp_event($node) {
   $content .= '<div>For: '. l($node->title, 'node/'. $node->nid);
-  $content .= ' - '. date("M d,  Y", $node->start) .'</div>';
+  $content .= ' - '. format_date($node->event_start, 'small', '', $node->start_offset) .'</div>';;
   return $content;
 }