Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* change for new version and upgrade.

Browse Source
This commit is contained in:
wangyidong
2016-08-05 10:55:55 +08:00
parent 2b4b2cb10e
commit 68e3e64a14
10 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
8.2.4
8.2.5
config/config.php
+1 -1
View File
@@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* Basic settings. */
$config = new config();
$config->version = '8.2.4'; // The version of zentaopms. Don't change it.
$config->version = '8.2.5'; // The version of zentaopms. Don't change it.
$config->charset = 'UTF-8'; // The charset of zentaopms.
$config->cookieLife = time() + 2592000; // The cookie life time.
$config->timezone = 'Asia/Shanghai'; // The time zone setting, for more see http://www.php.net/manual/en/timezones.php
module/admin/lang/zh-tw.php
+3 -3
View File
@@ -31,11 +31,11 @@ $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 = "如果您已經擁有社區帳號，%s關聯賬戶";
$lang->admin->register->success = "登記賬戶成功";
$lang->admin->bind = new stdclass();
$lang->admin->bind->caption = '關聯社區賬號';
$lang->admin->bind->caption = '關聯社區帳號';
$lang->admin->bind->success = "關聯賬戶成功";
$lang->admin->safe = new stdclass();
@@ -51,7 +51,7 @@ $lang->admin->safe->modeList[1] = '中';
$lang->admin->safe->modeList[2] = '強';
$lang->admin->safe->reasonList['weak'] = '常用弱口令';
$lang->admin->safe->reasonList['account'] = '與賬號相同';
$lang->admin->safe->reasonList['account'] = '與帳號相同';
$lang->admin->safe->reasonList['mobile'] = '與手機相同';
$lang->admin->safe->reasonList['phone'] = '與電話相同';
$lang->admin->safe->reasonList['birthday'] = '與生日相同';
module/bug/lang/zh-tw.php
+1 -1
View File
@@ -140,7 +140,7 @@ $lang->bug->confirmDelete = '您確認要刪除該Bug嗎？';
$lang->bug->setTemplateTitle = '請輸入bug模板標題';
$lang->bug->remindTask = '該Bug已經轉化為任務，是否更新任務(編號:%s)狀態 ?';
$lang->bug->skipClose = 'Bug %s 不是已解決狀態，不能關閉。';
$lang->bug->applyTemplate = '應用模版';
$lang->bug->applyTemplate = '應用模板';
/* 模板。*/
$lang->bug->tplStep = "<p>[步驟]</p>\n";
module/tutorial/lang/zh-tw.php
+2 -2
View File
@@ -35,9 +35,9 @@ $lang->tutorial->dataNotSave = "教程任務中，數據不會保存。";
$lang->tutorial->tasks = array();
$lang->tutorial->tasks['createAccount'] = array('title' => '創建賬號');
$lang->tutorial->tasks['createAccount'] = array('title' => '創建帳號');
$lang->tutorial->tasks['createAccount']['nav'] = array('module' => 'user', 'method' => 'create', 'menuModule' => 'company', 'menu' => 'addUser', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '添加用戶');
$lang->tutorial->tasks['createAccount']['desc'] = "<p>在系統創建一個新的用戶賬號：</p><ul><li data-target='nav'>打開 <span class='task-nav'>組織 <i class='icon icon-angle-right'></i> 用戶 <i class='icon icon-angle-right'></i> 添加用戶</span> 頁面；</li><li data-target='form'>在添加用戶表單中填寫新用戶信息；</li><li data-target='submit'>保存用戶信息。</li></ul>";
$lang->tutorial->tasks['createAccount']['desc'] = "<p>在系統創建一個新的用戶帳號：</p><ul><li data-target='nav'>打開 <span class='task-nav'>組織 <i class='icon icon-angle-right'></i> 用戶 <i class='icon icon-angle-right'></i> 添加用戶</span> 頁面；</li><li data-target='form'>在添加用戶表單中填寫新用戶信息；</li><li data-target='submit'>保存用戶信息。</li></ul>";
$lang->tutorial->tasks['createProduct'] = array('title' => '創建產品');
$lang->tutorial->tasks['createProduct']['nav'] = array('module' => 'product', 'method' => 'create', 'menu' => 'create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '新增產品');
module/upgrade/lang/en.php
+1
View File
@@ -105,3 +105,4 @@ $lang->upgrade->fromVersions['8_2'] = '8.2';
$lang->upgrade->fromVersions['8_2_1'] = '8.2.1';
$lang->upgrade->fromVersions['8_2_2'] = '8.2.2';
$lang->upgrade->fromVersions['8_2_3'] = '8.2.3';
$lang->upgrade->fromVersions['8_2_4'] = '8.2.4';
module/upgrade/lang/zh-cn.php
+1
View File
@@ -105,3 +105,4 @@ $lang->upgrade->fromVersions['8_2'] = '8.2';
$lang->upgrade->fromVersions['8_2_1'] = '8.2.1';
$lang->upgrade->fromVersions['8_2_2'] = '8.2.2';
$lang->upgrade->fromVersions['8_2_3'] = '8.2.3';
$lang->upgrade->fromVersions['8_2_4'] = '8.2.4';
module/upgrade/lang/zh-tw.php
+1
View File
@@ -105,3 +105,4 @@ $lang->upgrade->fromVersions['8_2'] = '8.2';
$lang->upgrade->fromVersions['8_2_1'] = '8.2.1';
$lang->upgrade->fromVersions['8_2_2'] = '8.2.2';
$lang->upgrade->fromVersions['8_2_3'] = '8.2.3';
$lang->upgrade->fromVersions['8_2_4'] = '8.2.4';
module/upgrade/model.php
+2
View File
@@ -146,6 +146,7 @@ class upgradeModel extends model
$this->execSQL($this->getUpgradeFile('8.2.1'));
case '8_2_2':
case '8_2_3':
case '8_2_4':
default: if(!$this->isError()) $this->setting->updateVersion($this->config->version);
}
@@ -227,6 +228,7 @@ class upgradeModel extends model
case '8_2_1': $confirmContent .= file_get_contents($this->getUpgradeFile('8.2.1'));
case '8_2_2':
case '8_2_3':
case '8_2_4':
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}
module/user/lang/zh-tw.php
+2 -2
View File
@@ -41,7 +41,7 @@ $lang->user->join = '入職日期';
$lang->user->visits = '訪問次數';
$lang->user->ip = '最後IP';
$lang->user->last = '最後登錄';
$lang->user->ranzhi = '然之賬號';
$lang->user->ranzhi = '然之帳號';
$lang->user->ditto = '同上';
$lang->user->originalPassword = '原密碼';
$lang->user->verifyPassword = '請輸入你的密碼';
@@ -119,7 +119,7 @@ $lang->user->statusList['active'] = '正常';
$lang->user->statusList['delete'] = '刪除';
$lang->user->keepLogin['on'] = '保持登錄';
$lang->user->loginWithDemoUser = '使用demo賬號登錄：';
$lang->user->loginWithDemoUser = '使用demo帳號登錄：';
$lang->user->placeholder = new stdclass();
$lang->user->placeholder->account = '英文、數字和下劃線的組合，三位以上';