fixed several parse errors with gettext stuff

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@174 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/config/config.php b/config/config.php
index 8a49bf27ad7d16c6d835823c8b72420cef6b41c9..ec35eca2c165bbbbaa144044ac84a180c50fc060 100644 (file)
--- a/config/config.php
+++ b/config/config.php
@@ -10,17 +10,17 @@
     $org_title = "SquirrelMail $version";
 
 //  The server that your imap server is on
-    $imapServerAddress = "localhost";
+    $imapServerAddress = "adam";
     $imapPort = 143;
 
 //  The domain where your email address is.
 //   Example:  in "luke@usa.om.org", usa.om.org is the domain.
 //             this is for all the messages sent out.  Reply address
 //             is generated by $username@$domain
-    $domain = "localhost";
+    $domain = "usa.om.org";
 
 //  Your SMTP server and port number (usually the same as the IMAP server)
-    $smtpServerAddress = "localhost";
+    $smtpServerAddress = "adam";
     $smtpPort = 25;
 
 //  Uncomment this if you want to deliver locally using sendmail instead

diff --git a/functions/display_messages.php b/functions/display_messages.php
index f67711637afb591b0958851624f66125125dbac5..fdfba0a3e36936d51f31a2a56ae7faaab2d7eb10 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -103,7 +103,7 @@
       echo "<TABLE COLS=1 WIDTH=70% NOBORDER BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
       echo "   <TR>";
       echo "      <TD BGCOLOR=\"$color[0]\">";
-      echo "         <FONT FACE=\"Arial,Helvetica\" COLOR=\"$color[2]\"><B><CENTER>. _("ERROR") .</CENTER></B></FONT>";
+      echo "         <FONT FACE=\"Arial,Helvetica\" COLOR=\"$color[2]\"><B><CENTER>" . _("ERROR") . "</CENTER></B></FONT>";
       echo "   </TD></TR><TR><TD>";
       echo "      <CENTER><FONT FACE=\"Arial,Helvetica\"><BR>$message";
       echo "      </FONT></CENTER>";

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index f4a52c13336fc28821e36a245c5a8b1a15c87bd1..981f1b67e1d9ab2e60f6aaf6af98889836ae31a3 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -268,16 +268,16 @@
 
       echo "<TR BGCOLOR=\"$color[4]\"><TD>";
       if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) {
-         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">". _("Previous") ."</FONT></A>\n";
-         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">". _"(Next") ."</FONT></A>\n";
+         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">" . _("Previous") . "</FONT></A>\n";
+         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">" . _("Next") . "</FONT></A>\n";
       }
       else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) {
-         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">". _("Previous") ."</FONT></A>\n";
-         echo "<FONT FACE=\"Arial,Helvetica\" COLOR=\"$color[9]\">". _"(Next") ."</FONT>\n";
+         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">" . _("Previous") . "</FONT></A>\n";
+         echo "<FONT FACE=\"Arial,Helvetica\" COLOR=\"$color[9]\">" . _("Next") . "</FONT>\n";
       }
       else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) {
          echo "<FONT FACE=\"Arial,Helvetica\" COLOR=\"$color[9]\">Previous</FONT>\n";
-         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">". _("Next") ."</FONT></A>\n";
+         echo "<A HREF=\"right_main.php?sort=$sort&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\"><FONT FACE=\"Arial,Helvetica\">" . _("Next") . "</FONT></A>\n";
       }
       echo "</TD></TR></TABLE>"; /** End of message-list table */
    }

diff --git a/functions/page_header.php b/functions/page_header.php
index ae4038c5b77eae0251560f6a4e2e7f7ef14b8779..324206b5855e1fd9f91a844a73bb1d59c4f3c553 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -12,17 +12,17 @@
       echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 COLS=2 WIDTH=100% CELLSPACING=0 CELLPADDING=2>";
       echo "   <TR BGCOLOR=\"$color[9]\" WIDTH=100%>";
       echo "      <TD ALIGN=left WIDTH=30%>";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"signout.php\" TARGET=_top><B>". _"(Sign Out") ."</B></A></FONT>";
+      echo "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"signout.php\" TARGET=_top><B>" . _("Sign Out") . "</B></A></FONT>";
       echo "      </TD><TD ALIGN=right WIDTH=70%>";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><div align=right>". _("Current Folder: ") ".<B>$shortBoxName&nbsp;</div></B></FONT>";
+      echo "         <FONT FACE=\"Arial,Helvetica\"><div align=right>" . _("Current Folder: ") . "<B>$shortBoxName&nbsp;</div></B></FONT>";
       echo "      </TD>";
       echo "   </TR></TABLE>\n";
       echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 COLS=2 WIDTH=100% CELLSPACING=0 CELLPADDING=2><TR>";
       echo "      <TD ALIGN=left WIDTH=70%>";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"compose.php\">". _("Compose") ."</A></FONT>&nbsp&nbsp";
+      echo "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"compose.php\">" . _("Compose") . "</A></FONT>&nbsp&nbsp";
       echo "         <FONT FACE=\"Arial,Helvetica\">". _("Addresses") ."</FONT>&nbsp&nbsp";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"folders.php\">". _("Folders") ."</A></FONT>&nbsp&nbsp";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"options.php\">". _("Options") ."</A></FONT>&nbsp&nbsp";
+      echo "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"folders.php\">" . _("Folders") . "</A></FONT>&nbsp&nbsp";
+      echo "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"options.php\">" . _("Options") . "</A></FONT>&nbsp&nbsp";
       echo "      </TD><TD ALIGN=right WIDTH=30%>";
       echo "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"http://squirrelmail.sourceforge.net\" TARGET=_top>SquirrelMail</A></FONT>";
       echo "      </TD>";

diff --git a/functions/prefs.php b/functions/prefs.php
index 6962e6a585220d98a7cae5b262ae842aa76a3106..097c2dac2d0bc53a9ab4a92a8a73c129962096d7 100644 (file)
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -9,7 +9,7 @@
    function getPref($data_dir, $username, $string) {
       $filename = "$data_dir$username.pref";
       if (!file_exists($filename)) {
-         echo _("Preference file ") "\"$filename\"" _(" not found.  Exiting abnormally");
+         echo _("Preference file ") . "\"$filename\"" . _(" not found.  Exiting abnormally");
          exit;
       }
 
@@ -32,7 +32,7 @@
       $filename = "$data_dir$username.pref";
       $found = false;
       if (!file_exists($filename)) {
-         echo _("Preference file, ") "\"$filename\"". _(", does not exist.  Log out, and log back in to create a default preference file. ") ."<BR>";
+         echo _("Preference file, ") . "\"$filename\"" . _(", does not exist.  Log out, and log back in to create a default preference file. ") ."<BR>";
          exit;
       }
       $file = fopen($filename, "r");

diff --git a/src/read_body.php b/src/read_body.php
index 768e4860ad7ded34c4573d5363ce5cf99ce9e0ed..838e402c915bfb8c4803ed5a0d10a8a81a493e65 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -142,7 +142,7 @@
    echo "      <TR>\n";
    echo "         <TD BGCOLOR=\"$color[4]\" WIDTH=15% ALIGN=RIGHT>\n";
    echo "            <FONT FACE=\"Arial,Helvetica\">";
-   echo _("Date:")
+   echo _("Date:");
    echo "</FONT>\n";
    echo "         </TD><TD BGCOLOR=\"$color[4]\" WIDTH=85%>\n";
    echo "            <FONT FACE=\"Arial,Helvetica\"><B>$dateString</B></FONT>\n";