Made a few strings easier to translate.

[squirrelmail.git] / functions / display_messages.php

diff --git a/functions/display_messages.php b/functions/display_messages.php
index b07e2ae48fed1ed7a35aa3dd0a1640ff57a65145..a212a754ac85c94b24da27b1145d1536bc42b0c7 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -1,4 +1,4 @@
-<?
+<?php
    /**
     **  display_messages.php
     **
@@ -28,7 +28,9 @@
       echo "<TABLE COLS=1 WIDTH=100% CELLSPACING=0 CELLPADDING=3 NOBORDER BGCOLOR=\"#FFFFFF\" ALIGN=CENTER>";
       echo "   <TR>";
       echo "      <TD BGCOLOR=\"$color[0]\">";
-      echo "         <B><CENTER>". _("Welcome to $org_name's WebMail system") ."</CENTER></B>";
+      echo "         <B><CENTER>";
+      printf (_("Welcome to %s's WebMail system"), $org_name);
+      echo           "</CENTER></B>";
       echo "   <TR><TD BGCOLOR=\"#FFFFFF\">";
       echo "      <TABLE COLS=2 WIDTH=90% CELLSPACING=0 CELLPADDING=3 NOBORDER align=\"center\">";
       echo "         <TR>";
@@ -37,7 +39,9 @@
          echo "               <IMG SRC=\"$org_logo\">";
       else
          echo "               <B>$org_name</B>";
-      echo "         <BR><CENTER>". _("Running SquirrelMail version $version (c) 1999-2000.") ."</CENTER><BR>";
+      echo "         <BR><CENTER>";
+      printf (_("Running SquirrelMail version %s (c) 1999-2000."), $version);
+      echo           "</CENTER><BR>";
       echo "            </CENTER></TD></TR><TR>";
       echo "            <TD BGCOLOR=\"#FFFFFF\">";
       echo "               $motd";
@@ -51,6 +55,7 @@
 
     function messages_deleted_message($mailbox, $sort, $startMessage, $color) {
       $urlMailbox = urlencode($mailbox);
+
       echo "<BR>";
       echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
       echo "   <TR>";
@@ -60,7 +65,8 @@
       echo "      <CENTER><BR>". _("The selected messages were deleted successfully.") ."<BR>\n";
       echo "      <BR>";
       echo "              <A HREF=\"webmail.php?right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
-      echo "              ". _("Click here to return to ") ."$mailbox</A>.";
+      printf (_("Click here to return to %s"), $mailbox);
+      echo "</A>.";
       echo "      </CENTER>";
       echo "   </TD></TR>";
       echo "</TABLE>";
@@ -68,6 +74,7 @@
 
     function messages_moved_message($mailbox, $sort, $startMessage, $color) {
       $urlMailbox = urlencode($mailbox);
+
       echo "<BR>";
       echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
       echo "   <TR>";
@@ -77,7 +84,8 @@
       echo "      <CENTER><BR>". _("The selected messages were moved successfully.") ."<BR>\n";
       echo "      <BR>";
       echo "              <A HREF=\"webmail.php?right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
-      echo "              ". _("Click here to return to ") ."$mailbox</A>.";
+      printf (_("Click here to return to %s"), $mailbox);
+      echo "</A>.";
       echo "      </CENTER>";
       echo "   </TD></TR>";
       echo "</TABLE>";
@@ -85,6 +93,7 @@
 
     function error_message($message, $mailbox, $sort, $startMessage, $color) {
       $urlMailbox = urlencode($mailbox);
+
       echo "<BR>";
       echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
       echo "   <TR>";
@@ -94,8 +103,8 @@
       echo "      <CENTER><BR>$message<BR>\n";
       echo "      <BR>";
       echo "              <A HREF=\"webmail.php?right_frame=right_main.php&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\" TARGET=_top>";
-      echo "              ". _("Click here to return to ") ."$mailbox</A>.";
-      echo "      </CENTER>";
+      printf (_("Click here to return to %s"), $mailbox);
+      echo "</A>.";
       echo "   </TD></TR>";
       echo "</TABLE>";
     }