projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2505181)
Recycling existing strings
authorjervfors <jervfors@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Sat, 3 Sep 2005 22:19:24 +0000 (22:19 +0000)
committerjervfors <jervfors@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Sat, 3 Sep 2005 22:19:24 +0000 (22:19 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10035 7612ce4b-ef26-0410-bec9-ea0150e637f0

src/printer_friendly_bottom.php patch | blob | blame | history
templates/default/error_message.tpl patch | blob | blame | history

diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 1d681ed1d9ab95ed036627fcbf3e3c4dadfa6bc4..71764c144e29ed3cbe0045b0284151452fff4ffa 100644 (file)
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -139,7 +139,7 @@ echo '<body text="#000000" bgcolor="#FFFFFF" link="#000000" vlink="#000000" alin
      if (! empty($attachments)) {
          // attachments title
          echo html_tag( 'tr',
-             html_tag( 'td','<b>'._("Attachments:").'</b>', 'left', '', 'colspan="2"' )
+             html_tag( 'td','<b>'._("Attachments").':</b>', 'left', '', 'colspan="2"' )
          ) . "\n" ;
          // list of attachments
          echo html_tag( 'tr',
@@ -250,7 +250,7 @@ function pf_show_attachments($message, $exclude_id, $mailbox, $id) {
             $filename = $att->getFilename();
             if ($header->description) {
                 $description = '<tr>'.
-                    html_tag( 'td',_("Info:"), 'right') .
+                    html_tag( 'td',_("Info").':', 'right') .
                     html_tag( 'td',decodeHeader($header->description), 'left') .
                     '</tr>';
             } else {
@@ -263,10 +263,10 @@ function pf_show_attachments($message, $exclude_id, $mailbox, $id) {
         // TODO: maybe make it nicer?
         $attachments .= '<table border="1"><tr><th colspan="2">'.decodeHeader($display_filename).'</th></tr>' .
             '<tr border="0">'.
-            html_tag( 'td',_("Size:"), 'right') .
+            html_tag( 'td',_("Size").':', 'right') .
             html_tag( 'td',show_readable_size($header->size), 'left') .
             '</tr><tr>' .
-            html_tag( 'td',_("Type:"), 'right') .
+            html_tag( 'td',_("Type").':', 'right') .
             html_tag( 'td',htmlspecialchars($type0).'/'.htmlspecialchars($type1), 'left') . 
             '</tr>';
         if (! empty($description)) {
diff --git a/templates/default/error_message.tpl b/templates/default/error_message.tpl
index a87439d08bcbce7facbc9d61c13a2650b9293165..90931eace281b60c284da5cf3541044566db9168 100644 (file)
--- a/templates/default/error_message.tpl
+++ b/templates/default/error_message.tpl
@@ -24,7 +24,7 @@ if (isset($aErrors) && is_array($aErrors)) {
 <table class="error_table">
   <tr class="error_thead">
     <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>
   </tr>
 <?php
@@ -32,53 +32,53 @@ if (isset($aErrors) && is_array($aErrors)) {
 ?>
   <tr class="error_row">
     <td class="error_key">
-       <?php echo _("Category")?>:
+       <?php echo _("Category:"); ?>
     </td>
     <td class="error_val">
-       <?php foreach ($aError['category'] as $sCategory) {echo $sCategory;}?>
+       <?php foreach ($aError['category'] as $sCategory) {echo $sCategory;} ?>
     </td>
   </tr>
   <tr>
      <td class="error_key">
-       <?php echo _("Message")?>:
+       <?php echo _("Message:"); ?>
      </td>
      <td class="error_val">
-       <?php echo $aError['message'];?>
+       <?php echo $aError['message']; ?>
      </td>
   </tr>
 <?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">
     <td class="error_key">
-      <?php echo $sKey;?>:
+      <?php echo $sKey; ?>:
     </td>
     <td>
-      <?php echo $sValue;?>
+      <?php echo $sValue; ?>
     </td>
   </tr>
 <?php     } // foreach ($aError['extra'] as sKkey => $sValue)
        }   // 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">
     <td class="error_key">
-      <?php echo _("Tip");?>:
+      <?php echo _("Tip:"); ?>
     </td>
     <td class="error_val">
-      <?php echo $aError['tip'];?>
+      <?php echo $aError['tip']; ?>
     </td>
   </tr>
 <?php }   // (isset($aError['tip']) && ($aError['tip']))
 ?>
 
-<?php if (isset($aError['link']) && ($aError['link'])) {?>
+<?php if (isset($aError['link']) && ($aError['link'])) { ?>
   <tr class="error_row">
     <td class="error_key">
-      <?php echo _("More info");?>:
+      <?php echo _("More info:"); ?>
     </td>
     <td class="error_val">
-      <?php echo $aError['link'];?>
+      <?php echo $aError['link']; ?>
     </td>
   </tr>
 <?php }   // (isset($aError['link']) && ($aError['link']))
Unnamed repository; edit this file 'description' to name the repository.