From 32c7898caf59016a8b858f2dc3beb7f9e0049064 Mon Sep 17 00:00:00 2001 From: nehresma Date: Thu, 13 Jan 2000 23:07:42 +0000 Subject: [PATCH] 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 --- config/config.php | 6 +++--- functions/display_messages.php | 2 +- functions/mailbox_display.php | 10 +++++----- functions/page_header.php | 10 +++++----- functions/prefs.php | 4 ++-- src/read_body.php | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/config/config.php b/config/config.php index 8a49bf27..ec35eca2 100644 --- 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 f6771163..fdfba0a3 100644 --- a/functions/display_messages.php +++ b/functions/display_messages.php @@ -103,7 +103,7 @@ echo ""; echo " "; echo "
"; - echo "
. _("ERROR") .
"; + echo "
" . _("ERROR") . "
"; echo "
"; echo "

$message"; echo "
"; diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index f4a52c13..981f1b67 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -268,16 +268,16 @@ echo "
"; if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) { - echo "". _("Previous") ."\n"; - echo "". _"(Next") ."\n"; + echo "" . _("Previous") . "\n"; + echo "" . _("Next") . "\n"; } else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) { - echo "". _("Previous") ."\n"; - echo "". _"(Next") ."\n"; + echo "" . _("Previous") . "\n"; + echo "" . _("Next") . "\n"; } else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) { echo "Previous\n"; - echo "". _("Next") ."\n"; + echo "" . _("Next") . "\n"; } echo "
"; /** End of message-list table */ } diff --git a/functions/page_header.php b/functions/page_header.php index ae4038c5..324206b5 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -12,17 +12,17 @@ echo ""; echo " "; echo " "; echo "
"; - echo " ". _"(Sign Out") .""; + echo " " . _("Sign Out") . ""; echo " "; - echo "
". _("Current Folder: ") ".$shortBoxName 
"; + echo "
" . _("Current Folder: ") . "$shortBoxName 
"; echo "
\n"; echo ""; echo " "; diff --git a/functions/prefs.php b/functions/prefs.php index 6962e6a5..097c2dac 100644 --- 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. ") ."
"; + echo _("Preference file, ") . "\"$filename\"" . _(", does not exist. Log out, and log back in to create a default preference file. ") ."
"; exit; } $file = fopen($filename, "r"); diff --git a/src/read_body.php b/src/read_body.php index 768e4860..838e402c 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -142,7 +142,7 @@ echo " \n"; echo "
"; - echo " ". _("Compose") ."  "; + echo " " . _("Compose") . "  "; echo " ". _("Addresses") ."  "; - echo " ". _("Folders") ."  "; - echo " ". _("Options") ."  "; + echo " " . _("Folders") . "  "; + echo " " . _("Options") . "  "; echo " "; echo " SquirrelMail"; echo "
\n"; echo " "; - echo _("Date:") + echo _("Date:"); echo "\n"; echo " \n"; echo " $dateString\n"; -- 2.25.1