* change for en lang and zh-tw lang.

2017-01-03 10:18:33 +08:00
parent 147167bee6
commit 141b5c4df0
8 changed files with 76 additions and 23 deletions
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -9,12 +9,16 @@
 * @version     $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $
 * @link        http://www.zentao.net
 */
-$lang->admin->common  = 'Administration';
-$lang->admin->index   = 'Admin Home';
-$lang->admin->checkDB = 'Check Database Library';
-$lang->admin->sso     = 'RangerTeam';
-$lang->admin->safeIndex = 'Security';
-$lang->admin->checkWeak = 'Weak Password Check';
+$lang->admin->common        = 'Administration';
+$lang->admin->index         = 'Admin Home';
+$lang->admin->checkDB       = 'Check Database Library';
+$lang->admin->sso           = 'RangerTeam';
+$lang->admin->safeIndex     = 'Security';
+$lang->admin->checkWeak     = 'Weak Password Check';
+$lang->admin->certifyMobile = '认证手机';
+$lang->admin->certifyEmail  = '认证邮箱';
+$lang->admin->captcha       = '验证码';
+$lang->admin->getCaptcha    = '获取验证码';

 $lang->admin->info = new stdclass();
 $lang->admin->info->version = 'Current Version is %s,';
@@ -26,6 +30,7 @@ $lang->admin->notice->register = "Note: You haven't registered in ZenTao(www.zen
 $lang->admin->notice->ignore   = "Ignore";

 $lang->admin->register = new stdclass();
+$lang->admin->register->common     = '注册新帐号绑定';
 $lang->admin->register->caption    = 'Register';
 $lang->admin->register->click      = 'Click Here';
 $lang->admin->register->lblAccount = 'must be 3 characters combination of letters and numbers at least.';
--- a/module/admin/lang/zh-tw.php
+++ b/module/admin/lang/zh-tw.php
@@ -9,12 +9,16 @@
 * @version     $Id: zh-tw.php 4767 2013-05-05 06:10:13Z wwccss $
 * @link        http://www.zentao.net
 */
-$lang->admin->common  = '後台管理';
-$lang->admin->index   = '後台管理首頁';
-$lang->admin->checkDB = '檢查資料庫';
-$lang->admin->sso     = '然之整合';
-$lang->admin->safeIndex = '安全';
-$lang->admin->checkWeak = '弱口令檢查';
+$lang->admin->common        = '後台管理';
+$lang->admin->index         = '後台管理首頁';
+$lang->admin->checkDB       = '檢查資料庫';
+$lang->admin->sso           = '然之整合';
+$lang->admin->safeIndex     = '安全';
+$lang->admin->checkWeak     = '弱口令檢查';
+$lang->admin->certifyMobile = '認證手機';
+$lang->admin->certifyEmail  = '認證郵箱';
+$lang->admin->captcha       = '驗證碼';
+$lang->admin->getCaptcha    = '獲取驗證碼';

 $lang->admin->info = new stdclass();
 $lang->admin->info->version = '當前系統的版本是%s，';
@@ -26,12 +30,13 @@ $lang->admin->notice->register = "友情提示：您還未在禪道社區(www.ze
 $lang->admin->notice->ignore   = "不再提示";

 $lang->admin->register = new stdclass();
+$lang->admin->register->common     = '註冊新帳號綁定';
 $lang->admin->register->caption    = '禪道社區登記';
 $lang->admin->register->click      = '點擊此處';
 $lang->admin->register->lblAccount = '請設置您的用戶名，英文字母和數字的組合，三位以上。';
 $lang->admin->register->lblPasswd  = '請設置您的密碼。數字和字母的組合，六位以上。';
 $lang->admin->register->submit     = '登記';
-$lang->admin->register->bind       = "如果您已經擁有社區帳號，%s關聯賬戶";
+$lang->admin->register->bind       = "綁定已有帳號";
 $lang->admin->register->success    = "登記賬戶成功";

 $lang->admin->bind = new stdclass();
--- a/module/custom/lang/zh-tw.php
+++ b/module/custom/lang/zh-tw.php
@@ -69,10 +69,12 @@ $lang->custom->allLang     = '適用所有語言';
 $lang->custom->confirmRestore = '是否要恢復預設配置？';

 $lang->custom->notice = new stdclass();
-$lang->custom->notice->userRole    = '鍵的長度必須小於20個字元！';
-$lang->custom->notice->canNotAdd   = '該項參與運算，不提供自定義添加功能';
-$lang->custom->notice->forceReview = '指定人提交的需求必須評審。';
-$lang->custom->notice->longlife    = 'Bug列表頁面的久未處理標籤中，列出設置天數之前未處理的Bug。';
+$lang->custom->notice->userRole             = '鍵的長度必須小於20個字元！';
+$lang->custom->notice->canNotAdd            = '該項參與運算，不提供自定義添加功能';
+$lang->custom->notice->forceReview          = '指定人提交的需求必須評審。';
+$lang->custom->notice->longlife             = 'Bug列表頁面的久未處理標籤中，列出設置天數之前未處理的Bug。';
+$lang->custom->notice->priListKey           = '優先順序的鍵應當為數字！';
+$lang->custom->notice->severityListKey      = 'Bug嚴重程度的鍵應當為數字！';
 $lang->custom->notice->indexPage['product'] = "從8.2版本起增加了產品主頁視圖，是否預設進入產品主頁？";
 $lang->custom->notice->indexPage['project'] = "從8.2版本起增加了項目主頁視圖，是否預設進入項目主頁？";
 $lang->custom->notice->indexPage['qa']      = "從8.2版本起增加了測試主頁視圖，是否預設進入測試主頁？";
--- a/module/mail/lang/en.php
+++ b/module/mail/lang/en.php
@@ -8,9 +8,12 @@ $lang->mail->test   = 'Email Testing';
 $lang->mail->reset  = 'Reset';
 $lang->mail->browse = 'Email List';
 $lang->mail->delete = 'Delete Email';
-$lang->mail->sendCloud     = 'Send Cloud Email';
+$lang->mail->ztCloud       = '禅道云发信';
+$lang->mail->sendCloud     = 'Notice SendCloud';
 $lang->mail->batchDelete   = 'Batch Delete';
 $lang->mail->sendcloudUser = 'Sync Contact';
+$lang->mail->agreeLicense  = '同意';
+$lang->mail->disagree      = '不同意';

 $lang->mail->turnon      = 'Turn On';
 $lang->mail->async       = 'Asynchronous';
@@ -27,6 +30,7 @@ $lang->mail->debug       = 'Debug';
 $lang->mail->charset     = 'Charset';
 $lang->mail->accessKey   = 'Access Key';
 $lang->mail->secretKey   = 'Secret Key';
+$lang->mail->license     = '禅道云发信使用须知';

 $lang->mail->selectMTA = 'Select MTA';
 $lang->mail->smtp      = 'SMTP';
@@ -64,6 +68,7 @@ $lang->mail->secureList['']    = 'Plain';
 $lang->mail->secureList['ssl'] = 'ssl';
 $lang->mail->secureList['tls'] = 'tls';

+$lang->mail->more           = '更多...';
 $lang->mail->inputFromEmail = 'Enter Email Address';
 $lang->mail->nextStep       = 'Next';
 $lang->mail->successSaved   = 'Configuration has been saved.';
@@ -73,18 +78,31 @@ $lang->mail->successSended  = 'Sent!';
 $lang->mail->confirmDelete  = 'Do you want to delete it?';
 $lang->mail->sendmailTips   = 'Note: Email author will not receive this email.';
 $lang->mail->needConfigure  = 'Email configuration is not found. Please cinfigure the Email first.';
+$lang->mail->connectFail    = '无法连接禅道网站。';
+$lang->mail->centifyFail    = '验证失败，可能密钥已经修改。请重新绑定！';
 $lang->mail->nofsocket      = 'fsocket related function has been deactivated. Mails cannot send out. Please modify allow_url_fopen in php.ini to turn on Onopenssl, and restart Apache.';
 $lang->mail->noOpenssl      = 'Please turn on Onopenssl, and restart Apache.';
 $lang->mail->disableSecure  = 'No openssl. Disable ssl and tls.';
 $lang->mail->sendCloudFail  = 'Failed. Reason:';
 $lang->mail->sendCloudHelp  = <<<EOD
-<p>1、Notice SendCloud是SendCloud的Team通知服务。具体可以到<a href="http://notice.sendcloud.net/" target="_blank">notice.sendcloud.net</a>查看</p>
-<p>2、accessKey和secretKey可以到登陆后的"设置"页面查看。Email人地址和名称也在"设置"页面设置。</p>
-<p>3、Email时，Notice SendCloudContact里面的昵称要跟Email一致，否则无法成功Email。可以到[<a href='%s'>同步Contact</a>]页面，将ZenTaoUser同步到SendCloudContact中</p>
+
+
+
 EOD;
 $lang->mail->sendCloudSuccess = 'Done';
 $lang->mail->closeSendCloud   = 'Close';
 $lang->mail->addressWhiteList = 'Please add the email to the whilte list on email server to avoid be treated as spam';
+$lang->mail->ztCloudNotice    = <<<EOD
+
+
+
+
+
+
+
+
+
+EOD;

 $lang->mail->placeholder = new stdclass();
 $lang->mail->placeholder->password = 'Some mail needs to fill in the auth code, specific to the mailbox related settings query.';
--- a/module/mail/lang/zh-cn.php
+++ b/module/mail/lang/zh-cn.php
@@ -30,7 +30,7 @@ $lang->mail->debug       = '调试级别';
 $lang->mail->charset     = '编码';
 $lang->mail->accessKey   = 'accessKey';
 $lang->mail->secretKey   = 'secretKey';
-$lang->mail->license     = 'SendCloud发信须知';
+$lang->mail->license     = '禅道云发信使用须知';

 $lang->mail->selectMTA = '请选择发信方式：';
 $lang->mail->smtp      = 'SMTP发信';
--- a/module/mail/lang/zh-tw.php
+++ b/module/mail/lang/zh-tw.php
@@ -8,9 +8,12 @@ $lang->mail->test   = '測試發信';
 $lang->mail->reset  = '重置';
 $lang->mail->browse = '郵件列表';
 $lang->mail->delete = '刪除郵件';
-$lang->mail->sendCloud     = 'SendCloud發信';
+$lang->mail->ztCloud       = '禪道雲發信';
+$lang->mail->sendCloud     = 'Notice發信';
 $lang->mail->batchDelete   = '批量刪除';
 $lang->mail->sendcloudUser = '同步聯繫人';
+$lang->mail->agreeLicense  = '同意';
+$lang->mail->disagree      = '不同意';

 $lang->mail->turnon      = '是否打開';
 $lang->mail->async       = '非同步發送';
@@ -27,6 +30,7 @@ $lang->mail->debug       = '調試級別';
 $lang->mail->charset     = '編碼';
 $lang->mail->accessKey   = 'accessKey';
 $lang->mail->secretKey   = 'secretKey';
+$lang->mail->license     = 'SendCloud發信須知';

 $lang->mail->selectMTA = '請選擇發信方式：';
 $lang->mail->smtp      = 'SMTP發信';
@@ -64,6 +68,7 @@ $lang->mail->secureList['']    = '不加密';
 $lang->mail->secureList['ssl'] = 'ssl';
 $lang->mail->secureList['tls'] = 'tls';

+$lang->mail->more           = '更多...';
 $lang->mail->inputFromEmail = '請輸入發信郵箱：';
 $lang->mail->nextStep       = '下一步';
 $lang->mail->successSaved   = '配置信息已經成功保存。';
@@ -73,6 +78,8 @@ $lang->mail->successSended  = '成功發送！';
 $lang->mail->confirmDelete  = '是否刪除郵件？';
 $lang->mail->sendmailTips   = '提示：系統不會為當前操作者發信。';
 $lang->mail->needConfigure  = '無法找到郵件配置信息，請先配置郵件發送參數。';
+$lang->mail->connectFail    = '無法連接禪道網站。';
+$lang->mail->centifyFail    = '驗證失敗，可能密鑰已經修改。請重新綁定！';
 $lang->mail->nofsocket      = 'fsocket相關函數被禁用，不能發信！請在php.ini中修改allow_url_fopen為On，打開openssl擴展。 保存並重新啟動apache。';
 $lang->mail->noOpenssl      = 'ssl和tls加密，請打開openssl擴展。 保存並重新啟動apache。';
 $lang->mail->disableSecure  = '沒有openssl擴展，禁用ssl和tls加密';
@@ -85,6 +92,17 @@ EOD;
 $lang->mail->sendCloudSuccess = '操作成功';
 $lang->mail->closeSendCloud   = '關閉SendCloud';
 $lang->mail->addressWhiteList = '為防止郵件被屏蔽，請在郵件伺服器裡面將發信郵箱設為白名單';
+$lang->mail->ztCloudNotice    = <<<EOD
+<p>禪道雲發信是由禪道開發團隊和<a href='http://sendcloud.sohu.com/' target='_blank'>SendCloud</a>聯合推出的一個免費發信服務。</p>
+<p>您只需要在禪道官網註冊帳號，並完成手機和郵箱的驗證，即可享受免費的發信服務。</p>
+<p style='color:red'>您的認證信息我們會幫您提交到SendCloud的團隊進行認證，以獲得每天200封郵件的免費額度。</p>
+<ul>
+<li>您在禪道官網提交認證之後，即可享受每天<strong style='color:red'>50</strong>封的發信額度，為期<strong style='color:red'>3</strong>天。</li>
+<li>您的信息經由禪道官網審核之後，即可享受每天<strong style='color:red'>200</strong>封的發信額度，為期<strong style='color:red'>7</strong>天。</li>
+<li>您的信息經由SendCloud最終審核之後，即可長期享受每天<strong style='color:red'>200</strong>封的發信額度。</li>
+</ul>
+<p>如果不同意以上條款，就不能該服務。</p>
+EOD;

 $lang->mail->placeholder = new stdclass();
 $lang->mail->placeholder->password = '有些郵箱需要填寫單獨申請的授權碼，具體請到郵箱相關設置查詢。';
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -113,3 +113,4 @@ $lang->upgrade->fromVersions['8_2_6']     = '8.2.6';
 $lang->upgrade->fromVersions['8_3']       = '8.3';
 $lang->upgrade->fromVersions['8_3_1']     = '8.3.1';
 $lang->upgrade->fromVersions['8_4']       = '8.4';
+$lang->upgrade->fromVersions['8_4_1']     = '8.4.1';
--- a/tools/check.php
+++ b/tools/check.php
@@ -54,6 +54,8 @@ $whiteList[] = 'admin-ignore';
 $whiteList[] = 'admin-register';
 $whiteList[] = 'admin-win2unix';
 $whiteList[] = 'admin-bind';
+$whiteList[] = 'admin-certifyztemail';
+$whiteList[] = 'admin-certifyztmobile';
 $whiteList[] = 'story-commonaction';
 $whiteList[] = 'story-sendmail';
 $whiteList[] = 'webapp-ajaxaddview';
@@ -77,6 +79,7 @@ $whiteList[] = 'tutorial-index';
 $whiteList[] = 'tutorial-quit';
 $whiteList[] = 'tutorial-wizard';
 $whiteList[] = 'my-buildcontactlists';
+$whiteList[] = 'mail-ztcloud';

 /* checking actions of every module. */
 echo '-------------action checking-----------------' . "\n";
@@ -220,6 +223,7 @@ foreach(glob($moduleRoot . '*') as $modulePath)
    $configFile = $modulePath . '/config.php';

    if(!isset($lang->$moduleName)) $lang->$moduleName = new stdclass();
+    if(!isset($config->$moduleName)) $config->$moduleName = new stdclass();
    if(file_exists($cnLangFile)) include $cnLangFile;
    if(file_exists($enLangFile)) include $enLangFile;
    if(file_exists($configFile)) include $configFile;