From 699d57dc01914d3b16ea3a2dbeee87b2e08e3377 Mon Sep 17 00:00:00 2001 From: Teddysun Date: Wed, 31 May 2017 14:26:14 +0900 Subject: [PATCH 1/2] Improved Simplified Chinese PHPMailer language (#1063) Completed new language key $PHPMAILER_LANG['extension_missing']. Signed-off-by: Teddysun --- language/phpmailer.lang-zh_cn.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/language/phpmailer.lang-zh_cn.php b/language/phpmailer.lang-zh_cn.php index d85a0b1a..37537802 100644 --- a/language/phpmailer.lang-zh_cn.php +++ b/language/phpmailer.lang-zh_cn.php @@ -4,13 +4,14 @@ * @package PHPMailer * @author liqwei * @author young + * @author Teddysun */ $PHPMAILER_LANG['authenticate'] = 'SMTP 错误：登录失败。'; $PHPMAILER_LANG['connect_host'] = 'SMTP 错误：无法连接到 SMTP 主机。'; $PHPMAILER_LANG['data_not_accepted'] = 'SMTP 错误：数据不被接受。'; $PHPMAILER_LANG['empty_message'] = '邮件正文为空。'; -$PHPMAILER_LANG['encoding'] = '未知编码: '; +$PHPMAILER_LANG['encoding'] = '未知编码：'; $PHPMAILER_LANG['execute'] = '无法执行：'; $PHPMAILER_LANG['file_access'] = '无法访问文件：'; $PHPMAILER_LANG['file_open'] = '文件错误：无法打开文件：'; @@ -22,6 +23,6 @@ $PHPMAILER_LANG['provide_address'] = '必须提供至少一个收件人地 $PHPMAILER_LANG['recipients_failed'] = 'SMTP 错误：收件人地址错误：'; $PHPMAILER_LANG['signing'] = '登录失败：'; $PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP服务器连接失败。'; -$PHPMAILER_LANG['smtp_error'] = 'SMTP服务器出错: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP服务器出错：'; $PHPMAILER_LANG['variable_set'] = '无法设置或重置变量：'; -//$PHPMAILER_LANG['extension_missing'] = 'Extension missing: '; +$PHPMAILER_LANG['extension_missing'] = '丢失模块 Extension：'; From 29b2042fd1a5cbb987a26f0db1b0ba5af302f920 Mon Sep 17 00:00:00 2001 From: Manzoor Wani Date: Tue, 13 Jun 2017 17:29:32 +0530 Subject: [PATCH 2/2] Correct the attribute description (#1073) doCallback() receives $to, $cc and $bcc as arrays and passes them as such to the action function --- class.phpmailer.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/class.phpmailer.php b/class.phpmailer.php index 9c18c740..17cb5118 100644 --- a/class.phpmailer.php +++ b/class.phpmailer.php @@ -440,9 +440,9 @@ class PHPMailer * * Parameters: * boolean $result result of the send action - * string $to email address of the recipient - * string $cc cc email addresses - * string $bcc bcc email addresses + * array $to email addresses of the recipients + * array $cc cc email addresses + * array $bcc bcc email addresses * string $subject the subject * string $body the email body * string $from email address of sender