We use cookies to ensure you get the best experience on our website
Home Explore Help
Register Sign In
0ct0pu5
/
squirrelmail
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Recycling existing strings

Fredrik Jervfors 20 years ago
parent
c73a5b46c8
commit
c1b6dbe6df
2 changed files with 18 additions and 18 deletions
Unified View Show Diff Stats
  1. 4 4
      src/printer_friendly_bottom.php
  2. 14 14
      templates/default/error_message.tpl

+ 4 - 4
src/printer_friendly_bottom.php
View File 

@@ -139,7 +139,7 @@ echo '<body text="#000000" bgcolor="#FFFFFF" link="#000000" vlink="#000000" alin
 
      if (! empty($attachments)) {
 
      if (! empty($attachments)) {
 
          // attachments title
 
          // attachments title
 
          echo html_tag( 'tr',
 
          echo html_tag( 'tr',
 
-             html_tag( 'td','<b>'._("Attachments:").'</b>', 'left', '', 'colspan="2"' )
 
+             html_tag( 'td','<b>'._("Attachments").':</b>', 'left', '', 'colspan="2"' )
 
          ) . "\n" ;
 
          ) . "\n" ;
 
          // list of attachments
 
          // list of attachments
 
          echo html_tag( 'tr',
 
          echo html_tag( 'tr',
 
@@ -250,7 +250,7 @@ function pf_show_attachments($message, $exclude_id, $mailbox, $id) {
 
             $filename = $att->getFilename();
 
             $filename = $att->getFilename();
 
             if ($header->description) {
 
             if ($header->description) {
 
                 $description = '<tr>'.
 
                 $description = '<tr>'.
 
-                    html_tag( 'td',_("Info:"), 'right') .
 
+                    html_tag( 'td',_("Info").':', 'right') .
 
                     html_tag( 'td',decodeHeader($header->description), 'left') .
 
                     html_tag( 'td',decodeHeader($header->description), 'left') .
 
                     '</tr>';
 
                     '</tr>';
 
             } else {
 
             } else {
 
@@ -263,10 +263,10 @@ function pf_show_attachments($message, $exclude_id, $mailbox, $id) {
 
         // TODO: maybe make it nicer?
 
         // TODO: maybe make it nicer?
 
         $attachments .= '<table border="1"><tr><th colspan="2">'.decodeHeader($display_filename).'</th></tr>' .
 
         $attachments .= '<table border="1"><tr><th colspan="2">'.decodeHeader($display_filename).'</th></tr>' .
 
             '<tr border="0">'.
 
             '<tr border="0">'.
 
-            html_tag( 'td',_("Size:"), 'right') .
 
+            html_tag( 'td',_("Size").':', 'right') .
 
             html_tag( 'td',show_readable_size($header->size), 'left') .
 
             html_tag( 'td',show_readable_size($header->size), 'left') .
 
             '</tr><tr>' .
 
             '</tr><tr>' .
 
-            html_tag( 'td',_("Type:"), 'right') .
 
+            html_tag( 'td',_("Type").':', 'right') .
 
             html_tag( 'td',htmlspecialchars($type0).'/'.htmlspecialchars($type1), 'left') . 
             html_tag( 'td',htmlspecialchars($type0).'/'.htmlspecialchars($type1), 'left') . 
             '</tr>';
 
             '</tr>';
 
         if (! empty($description)) {
 
         if (! empty($description)) {

+ 14 - 14
templates/default/error_message.tpl
View File 

@@ -24,7 +24,7 @@ if (isset($aErrors) && is_array($aErrors)) {
 
 <table class="error_table">
 
 <table class="error_table">
 
   <tr class="error_thead">
 
   <tr class="error_thead">
 
     <td class="error_thead_caption" colspan="2">
 
     <td class="error_thead_caption" colspan="2">
 
-       <div class="thead_caption"><?php echo _("SquirrelMail notice messages");?></div>
 
+       <div class="thead_caption"><?php echo _("SquirrelMail notice messages"); ?></div>
 
     </td>
 
     </td>
 
   </tr>
 
   </tr>
 
 <?php
 
 <?php
 
@@ -32,53 +32,53 @@ if (isset($aErrors) && is_array($aErrors)) {
 
 ?>
 
 ?>
 
   <tr class="error_row">
 
   <tr class="error_row">
 
     <td class="error_key">
 
     <td class="error_key">
 
-       <?php echo _("Category")?>:
 
+       <?php echo _("Category:"); ?>
 
     </td>
 
     </td>
 
     <td class="error_val">
 
     <td class="error_val">
 
-       <?php foreach ($aError['category'] as $sCategory) {echo $sCategory;}?>
 
+       <?php foreach ($aError['category'] as $sCategory) {echo $sCategory;} ?>
 
     </td>
 
     </td>
 
   </tr>
 
   </tr>
 
   <tr>
 
   <tr>
 
      <td class="error_key">
 
      <td class="error_key">
 
-       <?php echo _("Message")?>:
 
+       <?php echo _("Message:"); ?>
 
      </td>
 
      </td>
 
      <td class="error_val">
 
      <td class="error_val">
 
-       <?php echo $aError['message'];?>
 
+       <?php echo $aError['message']; ?>
 
      </td>
 
      </td>
 
   </tr>
 
   </tr>
 
 <?php if (isset($aError['extra']) && is_array($aError['extra'])) {
 
 <?php if (isset($aError['extra']) && is_array($aError['extra'])) {
 
-           foreach ($aError['extra'] as $sKey => $sValue) {?>
 
+           foreach ($aError['extra'] as $sKey => $sValue) { ?>
 
   <tr class="error_row">
 
   <tr class="error_row">
 
     <td class="error_key">
 
     <td class="error_key">
 
-      <?php echo $sKey;?>:
 
+      <?php echo $sKey; ?>:
 
     </td>
 
     </td>
 
     <td>
 
     <td>
 
-      <?php echo $sValue;?>
 
+      <?php echo $sValue; ?>
 
     </td>
 
     </td>
 
   </tr>
 
   </tr>
 
 <?php     } // foreach ($aError['extra'] as sKkey => $sValue)
 
 <?php     } // foreach ($aError['extra'] as sKkey => $sValue)
 
        }   // isset($aError['extra']) && is_array($aError['extra']))
 
        }   // isset($aError['extra']) && is_array($aError['extra']))
 
 ?>
 
 ?>
 
 
 
-<?php if (isset($aError['tip']) && ($aError['tip'])) {?>
 
+<?php if (isset($aError['tip']) && ($aError['tip'])) { ?>
 
   <tr class="error_row">
 
   <tr class="error_row">
 
     <td class="error_key">
 
     <td class="error_key">
 
-      <?php echo _("Tip");?>:
 
+      <?php echo _("Tip:"); ?>
 
     </td>
 
     </td>
 
     <td class="error_val">
 
     <td class="error_val">
 
-      <?php echo $aError['tip'];?>
 
+      <?php echo $aError['tip']; ?>
 
     </td>
 
     </td>
 
   </tr>
 
   </tr>
 
 <?php }   // (isset($aError['tip']) && ($aError['tip']))
 
 <?php }   // (isset($aError['tip']) && ($aError['tip']))
 
 ?>
 
 ?>
 
 
 
-<?php if (isset($aError['link']) && ($aError['link'])) {?>
 
+<?php if (isset($aError['link']) && ($aError['link'])) { ?>
 
   <tr class="error_row">
 
   <tr class="error_row">
 
     <td class="error_key">
 
     <td class="error_key">
 
-      <?php echo _("More info");?>:
 
+      <?php echo _("More info:"); ?>
 
     </td>
 
     </td>
 
     <td class="error_val">
 
     <td class="error_val">
 
-      <?php echo $aError['link'];?>
 
+      <?php echo $aError['link']; ?>
 
     </td>
 
     </td>
 
   </tr>
 
   </tr>
 
 <?php }   // (isset($aError['link']) && ($aError['link']))
 
 <?php }   // (isset($aError['link']) && ($aError['link']))

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5