added Taiwan transation

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

diff --git a/ChangeLog b/ChangeLog
index 1a9b680353fc2f06d7b1371ab21bbd7f66be3db2..819dfead551f3c0d5c40fce591eb58ab69aebb88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 Version 1.0pre2 -- DEVELOPMENT
 ------------------------------
+- Fixed bug that didn't display login failure message
+- Fixed minor bug in sqimap_mailbox_list
+- Added sqimap_capability function to check capabilities of server.
+- Rewrote sqimap_get_delim to use NAMESPACE capability (if available) to get delimiter.
 - Added Catalan translation of Help documents by Josep Sanz <jsanz@fa.upc.es>
+- Added Taiwan translation by "ching" <ching@kiwa.com.tw>
 
 Version 1.0pre1 -- December 14, 2000 
 ------------------------------------

diff --git a/functions/i18n.php b/functions/i18n.php
index 6c046805ccf76976d821408ea0441a8a167aba29..d5672e922d142a42af68d9763fe3da2e514f313f 100644 (file)
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -46,6 +46,8 @@
    $languages["ca"]["CHARSET"] = "iso-8859-1";
        $languages["sr"]["NAME"]         = "Serbian";
        $languages["sr"]["CHARSET"] = "iso-8859-2";
+       $languages["tw"]["NAME"]    = "Taiwan";
+       $languages["tw"]["CHARSET"] = "big5";
 
    // Decodes a string to the internal encoding from the given charset
    function charset_decode ($charset, $string) {

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 1bbce301120e3eca55159686bdf6f441400c06b4..f40bbdb75db972bd5d3ce4aea19125f952334e6e 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -58,7 +58,7 @@
    function sqimap_login ($username, $password, $imap_server_address, $imap_port, $hide) {
       global $color, $squirrelmail_language, $HTTP_ACCEPT_LANGUAGE, $onetimepad;
 
-      $imap_stream = fsockopen ($imap_server_address, $imap_port, &$error_number, &$error_string);
+      $imap_stream = fsockopen ($imap_server_address, $imap_port, &$error_number, &$error_string, 0);
       $server_info = fgets ($imap_stream, 1024);
       
       // Decrypt the password

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index bb61742de312e39ba0d03c6b5a1eb4148268e11b..925679d8292751061031e6ef5f1ad2615c5748c1 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -113,7 +113,7 @@
       global $message_highlight_list;
       global $auto_expunge;
 
-      sqimap_mailbox_expunge($imapConnection, $mailbox, false);
+         if ($auto_expunge == true) sqimap_mailbox_expunge($imapConnection, $mailbox, false);
       sqimap_mailbox_select($imapConnection, $mailbox);
 
       if (!$use_cache) {