fixed mistype, added translation to i18n.php

[squirrelmail.git] / functions / prefs.php

diff --git a/functions/prefs.php b/functions/prefs.php
index b0a889418409a4be1532cbf3c8cf66ae6dd4a15b..a8c651246f4ffc2e3e7ebb677cef4a769b81a85f 100644 (file)
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -11,7 +11,7 @@
    function getPref($data_dir, $username, $string) {
       $filename = "$data_dir$username.pref";
       if (!file_exists($filename)) {
-         echo _("Preference file ") . "\"$filename\"" . _(" not found.  Exiting abnormally");
+        printf (_("Preference file %s not found. Exiting abnormally"), $filename);
          exit;
       }
 
@@ -33,7 +33,8 @@
       $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>";
+        printf (_("Preference file, %s, does not exist. Log out, and log back in to create a default preference file."), $filename);
+        echo "<br>\n";
          exit;
       }
       $file = fopen($filename, "r");
@@ -71,7 +72,8 @@
       $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>";
+        printf (_("Preference file, %s, does not exist. Log out, and log back in to create a default preference file."), $filename);
+        echo "\n<br>\n";
          exit;
       }
       $file = fopen($filename, "r");
@@ -137,13 +139,11 @@
       $filename = "$data_dir$username.sig";
       if (file_exists($filename)) {
          $file = fopen($filename, "r");
+         $sig = "";
          while (!feof($file)) {
             $sig .= fgets($file, 1024);
          }
          fclose($file);
-      } else {
-         echo _("Signature file not found.");
-         exit;
       }
       return $sig;
    }