diff --git a/lib/phpmailer/language/phpmailer.lang-zh-tw.php b/lib/phpmailer/language/phpmailer.lang-zh-tw.php index baf374295b..9dbfef7824 100644 --- a/lib/phpmailer/language/phpmailer.lang-zh-tw.php +++ b/lib/phpmailer/language/phpmailer.lang-zh-tw.php @@ -6,7 +6,7 @@ */ $PHPMAILER_LANG['authenticate'] = 'SMTP 錯誤:登錄失敗。\n請檢查您設置的用戶名密碼是否正確。\n有的系統登錄用戶名是完整的郵箱地址。'; -$PHPMAILER_LANG['connect_host'] = 'SMTP 錯誤:無法連接到 SMTP 主機,請確認禪道機器:\n1. 能ping通smtp伺服器;\n2. 使用telnet 命令能夠連接到smtp的發信連接埠;\n3. 如果上述步驟都是通的,windows請檢查防火牆設置,linux請關閉selnux或者執行"setsebool httpd_can_sendmail true"允許apache可以發信。'; +$PHPMAILER_LANG['connect_host'] = 'SMTP 錯誤:無法連接到 SMTP 主機,請確認禪道機器:\n1. 能ping通smtp伺服器。如果不能ping通,請查看網絡狀態,或查看域名解析是否正確,或聯繫網管;\n2. 使用telnet 命令能夠連接到smtp的發信連接埠;\n3. 如果上述步驟都是通的,windows請檢查防火牆和殺毒軟件設置,linux請關閉selnux或者執行"setsebool httpd_can_sendmail true"允許apache可以發信。'; $PHPMAILER_LANG['data_not_accepted'] = 'SMTP 錯誤:數據不被接受。'; //$P$PHPMAILER_LANG['empty_message'] = 'Message body empty'; $PHPMAILER_LANG['encoding'] = '未知編碼: '; @@ -18,7 +18,7 @@ $PHPMAILER_LANG['instantiate'] = '未知函數調用。'; //$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; $PHPMAILER_LANG['mailer_not_supported'] = '發信客戶端不被支持。'; $PHPMAILER_LANG['provide_address'] = '收件人沒有設置郵箱,請到組織視圖中檢查下相應用戶的email設置。'; -$PHPMAILER_LANG['recipients_failed'] = 'SMTP 錯誤:收件人地址錯誤:'; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP 錯誤:收件人地址錯誤,或檢查SMTP服務設置,是否允許發送該郵件地址:'; //$PHPMAILER_LANG['signing'] = 'Signing Error: '; //$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; //$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; diff --git a/module/bug/control.php b/module/bug/control.php index efd920d559..23ba0dd10f 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -952,30 +952,6 @@ class bug extends control die(); } - /** - * Custom fields. - * - * @access public - * @return void - */ - public function customFields() - { - if($_POST) - { - $customFields = $this->post->customFields; - $customFields = join(',', $customFields); - setcookie('bugFields', $customFields, $this->config->cookieLife, $this->config->webRoot); - die(js::reload('parent')); - } - - $customFields = $this->cookie->bugFields ? $this->cookie->bugFields : $this->config->bug->list->defaultFields; - - $this->view->allFields = $this->bug->getFieldPairs($this->config->bug->list->allFields); - $this->view->customFields = $this->bug->getFieldPairs($customFields); - $this->view->defaultFields = $this->bug->getFieldPairs($this->config->bug->list->defaultFields); - die($this->display()); - } - /** * AJAX: get bugs of a user in html select. * diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php index e4b5e05c4b..9170734629 100644 --- a/module/testtask/lang/zh-tw.php +++ b/module/testtask/lang/zh-tw.php @@ -105,5 +105,6 @@ $lang->testtask->mail->edit->title = "%s編輯了測試任務 #%s:%s"; $lang->testtask->testScope = '測試範疇'; $lang->testtask->action = new stdclass(); +$lang->testtask->action->testtaskopened = '$date, 由 $actor 創建測試任務 $objectID。' . "\n"; $lang->testtask->action->testtaskstarted = '$date, 由 $actor 啟動測試任務 $objectID。' . "\n"; $lang->testtask->action->testtaskclosed = '$date, 由 $actor 完成測試任務 $objectID。' . "\n";