Index: forward.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/forward/forward.module,v
retrieving revision 1.11.2.8
diff -u -r1.11.2.8 forward.module
--- forward.module	13 Apr 2006 15:45:05 -0000	1.11.2.8
+++ forward.module	31 May 2006 15:27:39 -0000
@@ -73,7 +73,7 @@
   }

   $host=parse_url($base_url);
-
+
   // Administrative Options
   $form['forward_options'] = array(
     '#type' => 'fieldset',
@@ -93,14 +93,14 @@
     '#title' => t('Form Type'),
     '#default_value' => variable_get('forward_form_type', "link"),
     '#options' => array("link" => "link", "form" => "form"),
-    '#description' => 'Select link for a forward this page link or form to use a collapsible forwarding form.',
+    '#description' => t('Select link for a forward this page link or form to use a collapsible forwarding form.'),
   );
   $form['forward_options']['forward_flood_control'] = array(
     '#type' => 'select',
     '#title' => t('Flood Control'),
     '#default_value' => variable_get('forward_flood_control', 10),
     '#options' => array('1' => '1', '5' => '5', '10' => '10', '15' => '15', '20' => '20', '25' => '25', '30' => '30', '35' => '35', '40' => '40', '50' => '50'),
-    '#description' => "How many times a user can use the form in a one hour period. This will help prevent the forward module from being used for spamming.",
+    '#description' => t("How many times a user can use the form in a one hour period. This will help prevent the forward module from being used for spamming."),
   );
   $form['forward_options']['forward_flood_error'] = array(
     '#type' => 'textarea',
@@ -108,9 +108,9 @@
     '#default_value' => variable_get('forward_flood_error_msg', t('In order to prevent spamming, we limit the number of messages you can send in a one hour period.  Please retry later.')),
     '#cols' => 40,
     '#rows' => 10,
-    '#description' => 'This text appears if a user exceeds the flood control limit.',
+    '#description' => t('This text appears if a user exceeds the flood control limit.'),
   );
-
+
   // Page Text Values
   $form['forward_text_values'] = array(
     '#type' => 'fieldset',
@@ -124,7 +124,7 @@
     '#default_value' => variable_get('forward_instructions', '<p>'.t('Thank you for your interest in spreading the word on').' '.variable_get('site_name', 'drupal').'.</p><p>'.t('NOTE: We only request your email address so that the person you are recommending the page to knows that you wanted them to see it, and that it is not junk mail. We do not capture any email address.').'</p>'),
     '#cols' => 40,
     '#rows' => 10,
-    '#description' => 'This message will be displayed above the form.',
+    '#description' => t('This message will be displayed above the form.'),
   );
   $form['forward_text_values']['forward_thankyou'] = array(
     '#type' => 'textarea',
@@ -132,9 +132,9 @@
     '#default_value' => variable_get('forward_thankyou', t('Thank you for your help in spreading the word about').' '.variable_get('site_name', 'drupal').'. '.t('We appreciate your help.')),
     '#cols' => 40,
     '#rows' => 10,
-    '#description' => 'This message will be displayed after the user successfully submits the form.',
+    '#description' => t('This message will be displayed after the user successfully submits the form.'),
   );
-
+
   // Forward Form Default Values
   $form['forward_default_values'] = array(
     '#type' => 'fieldset',
@@ -249,21 +249,21 @@
   }

   if (!flood_is_allowed('contact', variable_get('forward_flood_control', 10))) {
-    $output = t(variable_get('forward_flood_error_msg', "You can't send more than %number messages per hour. Please try again later."), array('%number' => CONTACT_HOURLY_THRESHOLD));
+    $output = variable_get('forward_flood_error_msg', t("You can't send more than %number messages per hour. Please try again later.", array('%number' => CONTACT_HOURLY_THRESHOLD));
   }
   else {
     $form = array();
     $url    = $base_url.'/node/'.$nid;
     $output = variable_get('forward_instructions', '<p>'.t('Thank you for your interest in spreading the word on').' '.variable_get('site_name', 'drupal').'.</p><p>'.t('NOTE: We only request your email address so that the person you are recommending the page to knows that you wanted them to see it, and that it is not junk mail. We do not capture any email address.').'</p>');
-
-
+
+
     if ($nid != '') {
       $emailtype = 'email';
     }
     else {
       $emailtype = 'postcard';
     }
-
+
     $form['message'] = array(
       '#type' => 'fieldset',
       '#title' => t('Message to Send'),
@@ -302,20 +302,20 @@
     if ($emailtype == 'email') {
       $form['message'][] = array(
         '#type' => 'item',
-        '#title' => 'Page Being Sent',
+        '#title' => t('Page Being Sent'),
         '#value' => $base_url.'/'.drupal_get_path_alias('node/'.$nid.''),
       );
     }
     $form['message']['subject'] = array(
       '#type' => 'item',
       '#title' => t('Message Subject'),
-      '#value' => t(variable_get('forward_'.$emailtype.'subject', '%name has sent you a message from %site'), array('%name' => t('(Your Name)'), '%site' => variable_get('site_name', 'drupal'))),
+      '#value' => variable_get('forward_'.$emailtype.'subject', t('%name has sent you a message from %site', array('%name' => t('(Your Name)'), '%site' => variable_get('site_name', 'drupal')))),
       '#description' => '',
     );
     $form['message']['body'] = array(
       '#type' => 'item',
       '#title' => t('Message Body'),
-      '#value' => t(variable_get('forward_'.$emailtype.'message', '%name thought you would like to see the %site web site.'), array('%name' => t('(Your Name)'), '%site' => variable_get('site_name', 'drupal'))),
+      '#value' => variable_get('forward_'.$emailtype.'message', t('%name thought you would like to see the %site web site.', array('%name' => t('(Your Name)'), '%site' => variable_get('site_name', 'drupal')))),
       '#description' => '',
     );
     $form['message']['message'] = array(
@@ -395,13 +395,13 @@
         $form['message']['subject'] = array(
           '#type' => 'item',
           '#title' => t('Message Subject'),
-          '#value' => t(variable_get('forward_emailsubject', '%name has forwarded a page to you from %site'), array('%name' => t('(Your Name)'), '%site' => variable_get('site_name', 'drupal'))),
+          '#value' => variable_get('forward_emailsubject', t('%name has forwarded a page to you from %site', array('%name' => t('(Your Name)'), '%site' => variable_get('site_name', 'drupal')))),
           '#description' => '',
         );
         $form['message']['body'] = array(
           '#type' => 'item',
           '#title' => t('Message Body'),
-          '#value' => t(variable_get('forward_'.$emailtype.'message', '%name thought you would like to see the %site web site.'), array('%name' => t('(Your Name)'), '%site' => variable_get('site_name', 'drupal'))),
+          '#value' => variable_get('forward_'.$emailtype.'message', t('%name thought you would like to see the %site web site.', array('%name' => t('(Your Name)'), '%site' => variable_get('site_name', 'drupal')))),
           '#description' => '',
         );
         $form['message']['message'] = array(
@@ -426,10 +426,10 @@
           '#type' => 'submit',
           '#value' => t('Send Message'),
         );
-
+
         $form['#method'] = 'post';
         $output = drupal_get_form('forward_form', $form);
-
+
         $node->body .= $output;
       break;
     }
@@ -441,11 +441,11 @@
   ### for possible editing
   global $form_values;
   ### To check values, simply access them w/ the same name with which they were declared
-
+
   if (!(flood_is_allowed('forward_node', variable_get('forward_flood_control', 10))) && !user_access('administer forward')) {
     form_set_error(NULL,variable_get('forward_flood_error_msg', t('Sorry, you have reached the maximum number of emails allowed per user. Please try later')));
   }
-
+
   $yemail     = $_POST['edit']['yemail'];
   $recipients = $_POST['edit']['recipients'];
   $message    = $_POST['edit']['message'];
@@ -460,7 +460,7 @@

   // convert addresses to an array
   $recipient_addresses = explode(', ', $recipients);
-
+
   $arBadStr = array("Content-Type:", "MIME-Version:", "Content-Transfer-Encoding:", "bcc:", "cc:");
   foreach($arBadStr as $tStr){
     if (eregi($tStr, $yemail) || eregi($tStr, $subject)) {
@@ -497,7 +497,7 @@
   // Compose the body:
   ### Note how the form values are accessed the same way they were accessed in the validate
   ### function
-
+
   //If selected assemble dynamic footer block.
   switch (variable_get('forward_dynamic_block','')) {
     case 'node':
@@ -521,7 +521,7 @@
       $dynamic_content .= forward_top5_list($query, $base_url,'blog');
       break;
   }
-
+
   if (!$edit['nid']) {
     $emailtype = 'postcard';
     $nid = '';
@@ -542,7 +542,7 @@
 	  'forward_header_image' => variable_get('forward_header_image', ''),
 	  'site_name' => variable_get('site_name', 'Drupal'),
 	  'yemail' => $edit['yemail'],
-	  'forward_message' => t(variable_get('forward_'.$emailtype.'message', '%name thought you would like to see the %site web site.'), array('%name' => l($edit['yname'], 'mailto:'.$edit['yemail'],NULL,NULL,NULL,TRUE), '%site' => variable_get('site_name', 'drupal'))),
+	  'forward_message' => variable_get('forward_'.$emailtype.'message', t('%name thought you would like to see the %site web site.', array('%name' => l($edit['yname'], 'mailto:'.$edit['yemail'],NULL,NULL,NULL,TRUE), '%site' => variable_get('site_name', 'drupal')))),
 	  'message' => $edit['message'],
 	  'base_url' => $base_url,
 	  'content' => $content,
@@ -550,14 +550,14 @@
 	  'forward_ad_footer' => variable_get('forward_ad_footer', ''),
 	  'forward_footer' => variable_get('forward_footer', '')
   );
-
+
   $body = theme('forward_'.$emailtype, $vars);
-  $subject = t(variable_get('forward_'.$emailtype.'subject', '%name has sent you a message from %site'), array('%name' => $edit['yname'], '%site' => variable_get('site_name', 'drupal')));
+  $subject = variable_get('forward_'.$emailtype.'subject', t('%name has sent you a message from %site', array('%name' => $edit['yname'], '%site' => variable_get('site_name', 'drupal'))));

   $headers = "From: ".$edit['yemail']."\n";
   $headers .= "MIME-Version: 1.0\n";
   $headers .= "Content-type: text/html; charset=utf-8\n";
-
+
   $recipients = trim($edit['recipients']);
   $recipients = str_replace(array("\r\n", "\n", "\r"), ', ', $recipients);
   $recipients = str_replace(',', ', ', $recipients);
@@ -568,7 +568,7 @@
   db_query("INSERT INTO {forward_log} (nid, type, timestamp) VALUES ('%d', '%s', %d)", $nid, "SENT", time());
   variable_set('forward_total', variable_get('forward_total', 0) +1);
   variable_set('forward_recipients', variable_get('forward_recipients', 0) + substr_count($recipients, ",") + 1);
-
+
   flood_register_event('forward_node');

   drupal_set_message(variable_get('forward_thankyou', t('Thank you for your help in spreading the word about').' '.variable_get('site_name', 'drupal').'. '.t('We appreciate your help.')), 'status');
Index: forward.theme
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/forward/forward.theme,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 forward.theme
--- forward.theme	11 Apr 2006 21:40:04 -0000	1.2.2.4
+++ forward.theme	31 May 2006 16:54:59 -0000
@@ -42,12 +42,12 @@
       <div id="body">
         <div class="frm_txt">'.$vars['forward_message'].'</div>';
         if ($vars['message']) { $output .= '
-        <div class="frm_title">Message from Sender:</div>
+        <div class="frm_title">'.t('Message from Sender').':</div>
         <div class="frm_txt"><p><b>'.$vars['message'].'</b></p></div>';}
         $output .= '
         <div><b>'.l($vars['content']->title, 'forward/'.$vars['content']->nid.'/email_ref',NULL,NULL,NULL,TRUE).'</b>';
         if (theme_get_setting('toggle_node_info_'.$vars['content']->type)) { $output .= '
-        <br /><i>by '.$vars['content']->name.'</i>';}
+        <br /><i>'.t('by %author', array('%author' => $vars['content']->name)).'</i>';}
         $output .= '
         </div>
         <div class="article">'.$vars['content']->teaser.'</div>
@@ -99,7 +99,7 @@
       <div id="body">
         <div class="frm_txt">'.$vars['forward_message'].'</div>';
         if ($vars['message']) { $output .= '
-        <div class="frm_title">Message from Sender:</div>
+        <div class="frm_title">'.t('Message from Sender').':</div>
         <div class="frm_txt">'.$vars['message'].'</div>';}
         $output .= '
         <div class="links">'.l(t('Click here to visit our site'), 'forward/'.$vars['nid'].'/email_ref',NULL,NULL,NULL,TRUE).'</div>