From 7379b349cb00371a0f1f3c74846cc8ec5bc9bea7 Mon Sep 17 00:00:00 2001 From: lkehresman Date: Tue, 9 Jan 2001 01:02:27 +0000 Subject: [PATCH] added Taiwan transation git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@918 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- ChangeLog | 5 +++++ functions/i18n.php | 2 ++ functions/imap_general.php | 2 +- functions/mailbox_display.php | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a9b6803..819dfead 100644 --- 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 +- Added Taiwan translation by "ching" Version 1.0pre1 -- December 14, 2000 ------------------------------------ diff --git a/functions/i18n.php b/functions/i18n.php index 6c046805..d5672e92 100644 --- 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 1bbce301..f40bbdb7 100755 --- 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 bb61742d..925679d8 100644 --- 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) { -- 2.25.1