Internationalization

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

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index 030796990921a800ffc1fec24b5c97e2727a216d..f52bb34f8a6e48df45c64b5087ce712f61e1909b 100644 (file)
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -127,21 +127,21 @@
          if ($Value['enabled'])
             $run ++;
       }
-      
+
       // short-circuit
       if ($run == 0) {
           return;
       }
-      
+
       sqimap_mailbox_select($imap_stream, 'INBOX');
-      
-      // Ask for a big list of all "Received" headers in the inbox with 
+
+      // Ask for a big list of all "Received" headers in the inbox with
       // flags for each message.  Kinda big.
       fputs($imap_stream, 'A3999 FETCH 1:* (FLAGS BODY.PEEK[HEADER.FIELDS ' .
        "(RECEIVED)])\r\n");
-      
+
       $read = sqimap_read_data ($imap_stream, 'A3999', true, $response, $message);
-      
+
       if ($response != 'OK')
           return;
 
@@ -159,46 +159,46 @@
           $i ++;
           $IsSpam = 0;
           $Scan = 1;
-          
-         // Check for normal IMAP servers
+
+          // Check for normal IMAP servers
           if ($filters_spam_scan == 'new') {
               if (is_int(strpos($Chunks[4], '\Seen'))) {
                   $Scan = 0;
               }
           }
-         
-         // Look through all of the Received headers for IP addresses
-         // Stop when I get ")" on a line
-         // Stop if I get "*" on a line (don't advance)
+
+          // Look through all of the Received headers for IP addresses
+          // Stop when I get ")" on a line
+          // Stop if I get "*" on a line (don't advance)
           // and above all, stop if $i is bigger than the total # of lines
           while (($i < count($read)) &&
                  ($read[$i][0] != ')' && $read[$i][0] != '*' &&
-                 $read[$i][0] != "\n") && (! $IsSpam))
-         {
+                  $read[$i][0] != "\n") && (! $IsSpam))
+          {
               // Check to see if this line is the right "Received from" line
               // to check
               if (is_int(strpos($read[$i], $SpamFilters_YourHop))) {
 
-                // short-circuit and skip work if we don't scan this one
+                // short-circuit and skip work if we don't scan this one
                  if ($Scan) {
                      $read[$i] = ereg_replace('[^0-9\.]', ' ', $read[$i]);
                      $elements = explode(' ', $read[$i]);
                      foreach ($elements as $value) {
-                     if ($value != '' &&
+                     if ($value != '' &&
                           ereg('[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}',
-                            $value, $regs)) {
-                         $Chunks = explode('.', $value);
-                          if ("$SpamFilters_DNScache[$value]" == "") {
+                               $value, $regs)) {
+                        $Chunks = explode('.', $value);
+                        if ("$SpamFilters_DNScache[$value]" == "") {
                              $SpamFilters_DNScache[$value] =
                                 filters_spam_check_site($Chunks[0], $Chunks[1],
-                                     $Chunks[2], $Chunks[3], $filters);
-                         }
-                         if ($SpamFilters_DNScache[$value]) {
-                           $IsSpam ++;
+                             $Chunks[2], $Chunks[3], $filters);
+                        }
+                        if ($SpamFilters_DNScache[$value]) {
+                            $IsSpam ++;
                             break;  // no sense in checking more IPs
-                         }
+                        }
                       }
-                     }
+                    }
                  }
               }
               $i ++;
@@ -209,12 +209,12 @@
               if (sqimap_mailbox_exists ($imap_stream, $filters_spam_folder)) {
                   sqimap_messages_copy ($imap_stream, $MsgNum, $MsgNum,
                                         $filters_spam_folder);
-                  sqimap_messages_flag ($imap_stream, $MsgNum, $MsgNum, 
+                  sqimap_messages_flag ($imap_stream, $MsgNum, $MsgNum,
                                         'Deleted');
               }
           }
       }
-      
+
       sqimap_mailbox_expunge($imap_stream, 'INBOX');
    }   
 

diff --git a/plugins/newmail/newmail.php b/plugins/newmail/newmail.php
index ce3a9247507b88733fb0ab47015e7b4328b323f9..240f78b33c4e30fda2432918491530dcf82231dd 100644 (file)
--- a/plugins/newmail/newmail.php
+++ b/plugins/newmail/newmail.php
@@ -14,10 +14,11 @@
    chdir ('../');
    require_once('../src/validate.php');
    require_once('../src/load_prefs.php');
-   
-   echo "<HTML>\n".
-        '<TITLE>' . _("New Mail") . "</TITLE>\n".
-        "<BODY bgcolor=\"$color[4]\" topmargin=0 leftmargin=0 rightmargin=0 marginwidth=0 marginheight=0>\n".
+   require_once('../functions/page_header.php');
+
+   displayHtmlHeader( _("New Mail"), '', FALSE );
+
+   echo "<BODY bgcolor=\"$color[4]\" topmargin=0 leftmargin=0 rightmargin=0 marginwidth=0 marginheight=0>\n".
         '<CENTER>'.
         "<table width=100% cellpadding=2 cellspacing=2 border=0>\n".
         "<tr>\n".
@@ -25,8 +26,8 @@
         '<b><center>' . _("SquirrelMail Notice:") . "</center></b>\n".
         "</td>\n".
         "</tr><tr>\n".
-        "<td><center><br><big><font color=\"$color[2]\">" . 
-        _("You have new mail!") . "</font></big><br>\n".
+        "<td><center><br><big><font color=\"$color[2]\">" .
+        _("You have new mail!") . "</font><br></big><br>\n".
         "<form name=nm>\n".
             '<input type=button name=bt value="Close Window" onClick="javascript:window.close();">'.
         "</form></center></td></tr></table></CENTER>\n".
@@ -36,5 +37,5 @@
         "-->\n".
         "</script>\n".
         "</BODY></HTML>\n";
-        
+
 ?>
\ No newline at end of file

diff --git a/plugins/newmail/testsound.php b/plugins/newmail/testsound.php
index 583dd8f192b58b46995879bac7423f2af4f11dd5..1ae75739c6dfbbd8ab5aa97d2d0dd6901b0b48f8 100644 (file)
--- a/plugins/newmail/testsound.php
+++ b/plugins/newmail/testsound.php
@@ -17,21 +17,23 @@
    if (!isset($sound)) {
     $sound = "Click.wav";
    }
-   $sound = str_replace("../plugins/newmail/", "", $sound);
-   $sound = str_replace("../", "", $sound);
-   $sound = str_replace("..\\", "", $sound);
-?>
-<HTML>
-<TITLE>Test Sound</TITLE>
-<BODY bgcolor=<?php echo $color[4] ?> topmargin=0 leftmargin=0
-rightmargin=0 marginwidth=0 marginheight=0>
-<CENTER>
-<embed src="<?php echo $sound ?>" hidden=true autostart=true>
-<br>
-<font face="Veranda, Arial Helvetica, sans-serif" size="2" </font>
-<b>Loading the sound...</b><br><br>
-<form>
-<input type="button" name="close" value="  Close  " onClick="window.close()">
-</form>
-</CENTER>
-</BODY></HTML>
+   $sound = str_replace('../plugins/newmail/', '', $sound);
+   $sound = str_replace('../', '', $sound);
+   $sound = str_replace("..\\", '', $sound);
+
+   displayHtmlHeader( _("Test Sound"), '', FALSE );
+
+   echo "<BODY bgcolor=\"$color[4]\" topmargin=0 leftmargin=0 rightmargin=0 marginwidth=0 marginheight=0>\n".
+        '<CENTER>'.
+        "<embed src=\"$sound\" hidden=true autostart=true>".
+        '<br>'.
+        '<b>' . _("Loading the sound...") . '</b><br><br>'.
+        '<form>'.
+        '<input type="button" name="close" value="  ' .
+        _("Close") .
+        '  " onClick="window.close()">'.
+        '</form>'.
+        '</CENTER>'.
+        '</BODY></HTML>';
+
+?>
\ No newline at end of file

diff --git a/po/squirrelmail.po b/po/squirrelmail.po
index 395f6022caa40e7c58842a099263d8b4aea8f93f..c573e2d701cfb58d374609d0e0e41f64bf803727 100644 (file)
--- a/po/squirrelmail.po
+++ b/po/squirrelmail.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-11-17 14:56+0100\n"
+"POT-Creation-Date: 2001-11-17 18:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2029,6 +2029,7 @@ msgstr ""
 msgid "The spellcheck is not finished. Really close and discard changes?"
 msgstr ""
 
+#: squirrelmail/plugins/newmail/testsound.php:33
 #: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:285
 #: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod.php:50
 msgid "Close"
@@ -2657,11 +2658,11 @@ msgstr ""
 msgid "New Mail"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail.php:25
+#: squirrelmail/plugins/newmail/newmail.php:26
 msgid "SquirrelMail Notice:"
 msgstr ""
 
-#: squirrelmail/plugins/newmail/newmail.php:29
+#: squirrelmail/plugins/newmail/newmail.php:30
 msgid "You have new mail!"
 msgstr ""
 
@@ -2688,3 +2689,11 @@ msgstr ""
 #, c-format
 msgid "%s New Message"
 msgstr ""
+
+#: squirrelmail/plugins/newmail/testsound.php:24
+msgid "Test Sound"
+msgstr ""
+
+#: squirrelmail/plugins/newmail/testsound.php:30
+msgid "Loading the sound..."
+msgstr ""