From 3caa3e985a119732da0d902b30a0e6e022f16d75 Mon Sep 17 00:00:00 2001 From: wyd621 Date: Fri, 9 Aug 2013 10:08:02 +0800 Subject: [PATCH] * add new version. --- VERSION | 2 +- config/config.php | 2 +- module/bug/lang/en.php | 2 +- module/bug/lang/zh-tw.php | 6 ++++-- module/common/lang/en.php | 1 + module/common/lang/zh-tw.php | 18 ++++++++++------- module/custom/lang/zh-tw.php | 20 +++++++++++++++++++ module/group/lang/resource.php | 36 ++++++++++++++++++++++++++++++++++ module/sso/config.php | 1 + module/story/lang/zh-tw.php | 2 +- module/task/lang/zh-tw.php | 2 +- module/testcase/config.php | 1 + module/testcase/lang/zh-tw.php | 9 +-------- module/upgrade/lang/en.php | 1 + module/upgrade/lang/zh-cn.php | 1 + module/upgrade/lang/zh-tw.php | 1 + module/upgrade/model.php | 3 +++ tools/check.php | 3 +++ 18 files changed, 89 insertions(+), 22 deletions(-) create mode 100644 module/custom/lang/zh-tw.php diff --git a/VERSION b/VERSION index c175e23c58..d9d56c6dfe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.3.beta +5.0.beta diff --git a/config/config.php b/config/config.php index 6059aa9124..d045a87d13 100644 --- a/config/config.php +++ b/config/config.php @@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}} /* Basic settings. */ $config = new config(); -$config->version = '4.2'; // The version of zentaopms. Don't change it. +$config->version = '5.0.beta'; // 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 diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 3c1cb69661..274bf6c60e 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -80,7 +80,7 @@ $lang->bug->assignTo = 'Assign'; $lang->bug->browse = 'Browse Bug'; $lang->bug->view = 'Bug Info'; $lang->bug->resolve = 'Resolve'; -$lang->bug->barchResolve = 'batchResolve'; +$lang->bug->batchResolve = 'Batch resolve'; $lang->bug->close = 'Close'; $lang->bug->activate = 'Activate'; $lang->bug->reportChart = 'Report'; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 7611b86ea6..85e1dd97eb 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -73,16 +73,18 @@ $lang->bug->index = '首頁'; $lang->bug->create = '提Bug'; $lang->bug->batchCreate = '批量添加'; $lang->bug->confirmBug = '確認'; +$lang->bug->batchConfirm = '批量確認'; $lang->bug->edit = '編輯'; -$lang->bug->batchEdit = '批量編輯'; +$lang->bug->batchEdit = '批量編輯'; $lang->bug->assignTo = '指派'; $lang->bug->browse = 'Bug列表'; $lang->bug->view = 'Bug詳情'; $lang->bug->resolve = '解決'; +$lang->bug->batchResolve = '批量解決'; $lang->bug->close = '關閉'; $lang->bug->activate = '激活'; $lang->bug->reportChart = '報表統計'; -$lang->bug->export = '導出'; +$lang->bug->export = '導出數據'; $lang->bug->delete = '刪除'; $lang->bug->saveTemplate = '保存模板'; $lang->bug->deleteTemplate = '刪除模板'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 265923f82b..f27a9524eb 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -316,6 +316,7 @@ $lang->menugroup->dept = 'company'; $lang->menugroup->todo = 'my'; $lang->menugroup->action = 'admin'; $lang->menugroup->extension = 'admin'; +$lang->menugroup->custom = 'admin'; $lang->menugroup->editor = 'admin'; $lang->menugroup->mail = 'admin'; $lang->menugroup->sso = 'admin'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 305fe16796..d8cf6134b8 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -272,24 +272,27 @@ $lang->admin = new stdclass(); $lang->admin->menu = new stdclass(); $lang->admin->menu->index = array('link' => '首頁|admin|index'); $lang->admin->menu->extension = array('link' => '擴展|extension|browse', 'subModule' => 'extension,editor'); +$lang->admin->menu->custom = array('link' => '自定義|custom|index', 'subModule' => 'custom'); $lang->admin->menu->mail = array('link' => '發信|mail|index', 'subModule' => 'mail'); $lang->admin->menu->clearData = array('link' => '清除數據|admin|cleardata'); $lang->admin->menu->convert = array('link' => '導入|convert|index', 'subModule' => 'convert'); $lang->admin->menu->trashes = array('link' => '資源回收筒|action|trash', 'subModule' => 'action'); $lang->admin->menu->sso = array('link' => '單點登錄|sso|browse', 'subModule' => 'sso'); -$lang->convert = new stdclass(); -$lang->upgrade = new stdclass(); -$lang->action = new stdclass(); -$lang->extension = new stdclass(); -$lang->editor = new stdclass(); -$lang->mail = new stdclass(); -$lang->sso = new stdclass(); +$lang->convert = new stdclass(); +$lang->upgrade = new stdclass(); +$lang->action = new stdclass(); +$lang->extension = new stdclass(); +$lang->custom = new stdclass(); +$lang->editor = new stdclass(); +$lang->mail = new stdclass(); +$lang->sso = new stdclass(); $lang->convert->menu = $lang->admin->menu; $lang->upgrade->menu = $lang->admin->menu; $lang->action->menu = $lang->admin->menu; $lang->extension->menu = $lang->admin->menu; +$lang->custom->menu = $lang->admin->menu; $lang->editor->menu = $lang->admin->menu; $lang->mail->menu = $lang->admin->menu; $lang->sso->menu = $lang->admin->menu; @@ -313,6 +316,7 @@ $lang->menugroup->dept = 'company'; $lang->menugroup->todo = 'my'; $lang->menugroup->action = 'admin'; $lang->menugroup->extension = 'admin'; +$lang->menugroup->custom = 'admin'; $lang->menugroup->editor = 'admin'; $lang->menugroup->mail = 'admin'; $lang->menugroup->sso = 'admin'; diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php new file mode 100644 index 0000000000..c4a9a03f17 --- /dev/null +++ b/module/custom/lang/zh-tw.php @@ -0,0 +1,20 @@ +custom->common = '自定義'; +$lang->custom->index = '首頁'; +$lang->custom->set = '自定義配置'; +$lang->custom->restore = '恢復預設'; +$lang->custom->key = '鍵'; +$lang->custom->value = '值'; + +$lang->custom->story = '需求'; +$lang->custom->task = '任務'; +$lang->custom->bug = 'Bug'; +$lang->custom->testcase = '測試用例'; +$lang->custom->testtask = '測試任務'; +$lang->custom->todo = '待辦'; +$lang->custom->user = '用戶'; + +$lang->custom->currentLang = '適用當前語言'; +$lang->custom->allLang = '適用所有語言'; + +$lang->custom->confirmRestore = '是否要恢復預設語言配置？'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 0c2efc9fcf..113710136f 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -903,3 +903,39 @@ $lang->changelog['4.0'][] = 'action-hideOne'; $lang->changelog['4.0'][] = 'action-hideAll'; $lang->changelog['4.0'][] = 'task-editEstimate'; $lang->changelog['4.0'][] = 'task-deleteEstimate'; + +$lang->changelog['4.1'][] = 'todo-batchFinish'; +$lang->changelog['4.1'][] = 'productplan-batchUnlinkStory'; +$lang->changelog['4.1'][] = 'company-view'; +$lang->changelog['4.1'][] = 'user-story'; +$lang->changelog['4.1'][] = 'user-testTask'; +$lang->changelog['4.1'][] = 'user-testCase'; + +$lang->changelog['4.2.beta'][] = 'tree-browseTask'; + +$lang->changelog['4.3.beta'][] = 'product-batchEdit'; +$lang->changelog['4.3.beta'][] = 'project-batchEdit'; +$lang->changelog['4.3.beta'][] = 'story-batchReview'; +$lang->changelog['4.3.beta'][] = 'story-batchChangePlan'; +$lang->changelog['4.3.beta'][] = 'story-batchChangeStage'; +$lang->changelog['4.3.beta'][] = 'productplan-linkBug'; +$lang->changelog['4.3.beta'][] = 'productplan-unlinkBug'; +$lang->changelog['4.3.beta'][] = 'productplan-batchUnlinkBug'; +$lang->changelog['4.3.beta'][] = 'bug-batchCreate'; +$lang->changelog['4.3.beta'][] = 'testcase-exportTemplet'; +$lang->changelog['4.3.beta'][] = 'testcase-import'; +$lang->changelog['4.3.beta'][] = 'testcase-showImport'; +$lang->changelog['4.3.beta'][] = 'testcase-confirmChange'; +$lang->changelog['4.3.beta'][] = 'mail-reset'; +$lang->changelog['4.3.beta'][] = 'sso-browse'; +$lang->changelog['4.3.beta'][] = 'sso-create'; +$lang->changelog['4.3.beta'][] = 'sso-edit'; +$lang->changelog['4.3.beta'][] = 'sso-delete'; +$lang->changelog['4.3.beta'][] = 'api-debug'; +$lang->changelog['4.3.beta'][] = 'action-editComment'; + +$lang->changelog['5.0.beta'][] = 'bug-batchConfirm'; +$lang->changelog['5.0.beta'][] = 'bug-batchResolve'; +$lang->changelog['5.0.beta'][] = 'custom-index'; +$lang->changelog['5.0.beta'][] = 'custom-set'; +$lang->changelog['5.0.beta'][] = 'custom-restore'; diff --git a/module/sso/config.php b/module/sso/config.php index 35f8e1b88b..4e199981ee 100644 --- a/module/sso/config.php +++ b/module/sso/config.php @@ -1,4 +1,5 @@ sso = new stdclass(); $config->sso->create = new stdclass(); $config->sso->create->requiredFields = 'title,code,key,ip'; $config->sso->edit = new stdclass(); diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php index e182186108..ad28088ef0 100644 --- a/module/story/lang/zh-tw.php +++ b/module/story/lang/zh-tw.php @@ -28,7 +28,7 @@ $lang->story->tasks = "相關任務"; $lang->story->taskCount = '任務數'; $lang->story->bugs = "Bug"; $lang->story->linkStory = '關聯需求'; -$lang->story->export = "導出"; +$lang->story->export = "導出數據"; $lang->story->reportChart = "統計報表"; $lang->story->batchChangePlan = "批量修改計劃"; $lang->story->batchChangeStage = "批量修改階段"; diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index 8f6beef9e6..0a2b63791d 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -25,7 +25,7 @@ $lang->task->close = "關閉"; $lang->task->batchClose = "批量關閉"; $lang->task->cancel = "取消"; $lang->task->activate = "激活"; -$lang->task->export = "導出"; +$lang->task->export = "導出數據"; $lang->task->reportChart = "報表統計"; $lang->task->fromBug = '來源Bug'; $lang->task->confirmStoryChange = "確認需求變動"; diff --git a/module/testcase/config.php b/module/testcase/config.php index 8a43ec311e..eb9f410af8 100644 --- a/module/testcase/config.php +++ b/module/testcase/config.php @@ -1,4 +1,5 @@ testcase = new stdclass(); $config->testcase->defaultSteps = 3; $config->testcase->batchCreate = 10; diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php index 4f18d5b153..a756fade5f 100644 --- a/module/testcase/lang/zh-tw.php +++ b/module/testcase/lang/zh-tw.php @@ -65,7 +65,7 @@ $lang->testcase->import = "導入"; $lang->testcase->importID = "行號"; $lang->testcase->showImport = "顯示導入內容"; $lang->testcase->exportTemplet = "導出模板"; -$lang->testcase->export = "導出"; +$lang->testcase->export = "導出數據"; $lang->testcase->confirmChange = '確認用例變動'; $lang->testcase->confirmStoryChange = '確認需求變動'; @@ -135,13 +135,6 @@ $lang->testcase->stageList['system'] = '系統測試階段'; $lang->testcase->stageList['smoke'] = '冒煙測試階段'; $lang->testcase->stageList['bvt'] = '版本驗證階段'; -$lang->testcase->stageListAB['unittest'] = '單元'; -$lang->testcase->stageListAB['feature'] = '功能'; -$lang->testcase->stageListAB['intergrate'] = '整合'; -$lang->testcase->stageListAB['system'] = '系統'; -$lang->testcase->stageListAB['smoke'] = '冒煙'; -$lang->testcase->stageListAB['bvt'] = '版本'; - $lang->testcase->statusList[''] = ''; $lang->testcase->statusList['normal'] = '正常'; $lang->testcase->statusList['blocked'] = '被阻塞'; diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index 330c1d004f..0b452b80d5 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -72,3 +72,4 @@ $lang->upgrade->fromVersions['4_0'] = '4.0'; $lang->upgrade->fromVersions['4_0_1'] = '4.0.1'; $lang->upgrade->fromVersions['4_1'] = '4.1'; $lang->upgrade->fromVersions['4_2_beta'] = '4.2.beta'; +$lang->upgrade->fromVersions['4_3_beta'] = '4.3.beta'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index dada729eaf..895a1b6953 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -72,3 +72,4 @@ $lang->upgrade->fromVersions['4_0'] = '4.0'; $lang->upgrade->fromVersions['4_0_1'] = '4.0.1'; $lang->upgrade->fromVersions['4_1'] = '4.1'; $lang->upgrade->fromVersions['4_2_beta'] = '4.2.beta'; +$lang->upgrade->fromVersions['4_3_beta'] = '4.3.beta'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 36e3161374..3d71b43823 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -72,3 +72,4 @@ $lang->upgrade->fromVersions['4_0'] = '4.0'; $lang->upgrade->fromVersions['4_0_1'] = '4.0.1'; $lang->upgrade->fromVersions['4_1'] = '4.1'; $lang->upgrade->fromVersions['4_2_beta'] = '4.2.beta'; +$lang->upgrade->fromVersions['4_3_beta'] = '4.3.beta'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 27edd4eba1..bb38434846 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -92,6 +92,8 @@ class upgradeModel extends model $this->deleteCompany(); case '4_2_beta': $this->execSQL($this->getUpgradeFile('4.2')); + case '4_3_beta': + $this->execSQL($this->getUpgradeFile('4.3')); default: if(!$this->isError()) $this->setting->updateVersion($this->config->version); } @@ -143,6 +145,7 @@ class upgradeModel extends model case '4_0_1': $confirmContent .= file_get_contents($this->getUpgradeFile('4.0.1')); case '4_1': $confirmContent .= file_get_contents($this->getUpgradeFile('4.1')); case '4_2_beta': $confirmContent .= file_get_contents($this->getUpgradeFile('4.2')); + case '4_3_beta': $confirmContent .= file_get_contents($this->getUpgradeFile('4.3')); } return str_replace('zt_', $this->config->db->prefix, $confirmContent); } diff --git a/tools/check.php b/tools/check.php index 66f750ce0d..8f5a29d06d 100755 --- a/tools/check.php +++ b/tools/check.php @@ -53,6 +53,9 @@ $whiteList[] = 'story-commonaction'; $whiteList[] = 'story-sendmail'; $whiteList[] = 'webapp-ajaxaddview'; $whiteList[] = 'report-remind'; +$whiteList[] = 'sso-auth'; +$whiteList[] = 'sso-depts'; +$whiteList[] = 'sso-users'; /* checking actions of every module. */ echo '-------------action checking-----------------' . "\n";