$headers_to_display contains TRANSLATED key values! Thanks to Stefano Bridi.

[squirrelmail.git] / templates / default_advanced / read_headers.tpl

diff --git a/templates/default_advanced/read_headers.tpl b/templates/default_advanced/read_headers.tpl
index d26cf74511b614aab73e0cf49be232c725579255..6759ff5d093b8a5c6c60306a2ffa01ce8cf599e5 100644 (file)
--- a/templates/default_advanced/read_headers.tpl
+++ b/templates/default_advanced/read_headers.tpl
@@ -14,7 +14,7 @@
  *                          additional templates.
  * 
  *
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2008 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id: read_headers.tpl 11998 2006-12-10 21:06:24Z pdontthink $
  * @package squirrelmail
@@ -56,12 +56,12 @@ extract($t);
     // show reduced (collapsed) header
     if (!$expand_header) {
 
-        $subject = (!empty($headers_to_display['Subject']) 
-                    ? $headers_to_display['Subject'] : _("(no subject)"));
-        $date = (!empty($headers_to_display['Date']) 
-                 ? $headers_to_display['Date'] : _("Unknown date"));
-        $from = (!empty($headers_to_display['From']) 
-                    ? $headers_to_display['From'] : _("Unknown sender"));
+        $subject = (!empty($headers_to_display[_("Subject")]) 
+                    ? $headers_to_display[_("Subject")] : _("(no subject)"));
+        $date = (!empty($headers_to_display[_("Date")]) 
+                 ? $headers_to_display[_("Date")] : _("Unknown date"));
+        $from = (!empty($headers_to_display[_("From")]) 
+                    ? $headers_to_display[_("From")] : _("Unknown sender"));
         // if available, print "real" name instead of email addr
         if (strpos($from,"<") !== FALSE) {
             list($from, $ignore) = $parts = explode('<', $from);
@@ -70,7 +70,8 @@ extract($t);
             $from = preg_replace('/^(")+|(")+$/', '', $from);
             $from = preg_replace('/"$/', '', trim($from));
         }
-        $reduced_header = sprintf(_("<b>%s</b> From <b>%s</b> On <b>%s</b>"), $subject, $from, $date);
+        // i18n: The parameters are: subject, sender, and date.
+        $reduced_header = sprintf(_("%s from %s on %s"), "<b>$subject</b>", "<b>$from</b>", "<b>$date</b>");
         $expand_link = str_replace('&expand_header=0', '', $PHP_SELF) . '&expand_header=1';
 
         echo '<tr><td colspan="2" align="center" valign="top">'
@@ -91,7 +92,7 @@ extract($t);
                 continue;
             }
         ?>
- <tr>
+ <tr class="field_<?php echo $field_name; ?>">
   <td class="fieldName">
 <?php 
         if ($first_time) 
@@ -119,3 +120,12 @@ extract($t);
  </tr>
 </table>
 </div>
+<?php
+// do a conditional refresh of message list if needed
+// "pp_rr" = "preview pane read refresh"
+// "pp_rr_force" = force pp_rr even if this is not the first time the message has been read
+if ($show_preview_pane
+ && (sqGetGlobalVar('pp_rr_force', $pp_rr_force, SQ_FORM)
+ || (sqGetGlobalVar('pp_rr', $pp_rr, SQ_FORM) && $first_time_reading))) {
+    echo "<script language=\"JavaScript\" type=\"text/javascript\">\n<!--\nif (self.name == 'bottom') { refresh_message_list(); }\n// -->\n</script>\n";
+}