diff --git a/VERSION b/VERSION index cb90e90fa9..37ad5c8b19 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -9.0.stable +9.0.1 diff --git a/config/config.php b/config/config.php index 1c264e9944..a17812aaf8 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 = '9.0'; // The version of zentaopms. Don't change it. +$config->version = '9.0.1'; // 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/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index 9e60d13bfb..2155f670c2 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -248,7 +248,7 @@ $lang->block->modules['common']->moreLinkList->dynamic = 'company|dynamic|'; $lang->block->flowchart = array(); $lang->block->flowchart[] = array('管理員', '維護公司', '添加用戶', '維護權限'); -$lang->block->flowchart[] = array('產品經理', '創建產品', '維護模組', '維護計劃', '維護需求', '創建發佈'); -$lang->block->flowchart[] = array('項目經理', '創建項目', '維護團隊', '關聯產品', '關聯需求', '分解任務'); +$lang->block->flowchart[] = array($lang->productCommon . '經理', '創建' . $lang->productCommon, '維護模組', '維護計劃', '維護需求', '創建發佈'); +$lang->block->flowchart[] = array($lang->projectCommon . '經理', '創建' . $lang->projectCommon, '維護團隊', '關聯' . $lang->productCommon, '關聯需求', '分解任務'); $lang->block->flowchart[] = array('研發人員', '領取任務和Bug', '更新狀態', '完成任務和Bug'); $lang->block->flowchart[] = array('測試人員', '撰寫用例', '執行用例', '提交Bug', '驗證Bug', '關閉Bug'); diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 33de227446..7c24085bbc 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -119,6 +119,7 @@ $lang->bug->lblLastEdited = 'Last Edited'; $lang->bug->lblResolved = 'Resolved By'; $lang->bug->allUsers = 'All User'; $lang->bug->allBuilds = 'All'; +$lang->bug->createBuild = 'New'; /* legend列表。*/ $lang->bug->legendBasicInfo = 'Basic Info'; @@ -345,6 +346,7 @@ $lang->bug->action->unlinkrelatedbug = array('main' => '$date, unlinked by bug->placeholder = new stdclass(); $lang->bug->placeholder->chooseBuilds = 'Choose Build...'; +$lang->bug->placeholder->newBuildName = 'The name of new build'; $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed; $lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index f2a65f27c0..d693e104da 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -119,6 +119,7 @@ $lang->bug->lblLastEdited = '最後修改'; $lang->bug->lblResolved = '由誰解決'; $lang->bug->allUsers = '所有用戶'; $lang->bug->allBuilds = '所有'; +$lang->bug->createBuild = '新建'; /* legend列表。*/ $lang->bug->legendBasicInfo = '基本信息'; @@ -345,6 +346,7 @@ $lang->bug->action->unlinkrelatedbug = array('main' => '$date, 由 $a $lang->bug->placeholder = new stdclass(); $lang->bug->placeholder->chooseBuilds = '選擇相關版本...'; +$lang->bug->placeholder->newBuildName = '新版本名稱'; $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed; $lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs; diff --git a/module/build/lang/en.php b/module/build/lang/en.php index 1193399895..ef5a374b3e 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -29,6 +29,7 @@ $lang->build->basicInfo = 'Basic Info'; $lang->build->id = 'ID'; $lang->build->product = $lang->productCommon; +$lang->build->project = $lang->projectCommon; $lang->build->name = 'Name'; $lang->build->date = 'Date'; $lang->build->builder = 'Builder'; diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php index 458f2fa1cb..6edff8498c 100644 --- a/module/build/lang/zh-tw.php +++ b/module/build/lang/zh-tw.php @@ -29,6 +29,7 @@ $lang->build->basicInfo = '基本信息'; $lang->build->id = 'ID'; $lang->build->product = $lang->productCommon; +$lang->build->project = '所屬' . $lang->projectCommon; $lang->build->name = '名稱編號'; $lang->build->date = '打包日期'; $lang->build->builder = '構建者'; diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php index 8edcc83846..7080132c68 100644 --- a/module/doc/lang/zh-tw.php +++ b/module/doc/lang/zh-tw.php @@ -84,7 +84,7 @@ $lang->doc->aclList['open'] = '公開'; $lang->doc->aclList['custom'] = '自定義'; $lang->doc->aclList['private'] = '私有'; -$lang->doc->types['text'] = '網頁'; +$lang->doc->types['text'] = '文檔'; $lang->doc->types['url'] = '連結'; $lang->doc->contentTypeList['html'] = 'HTML'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index a979fb86c7..9df8d39a8c 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -260,3 +260,4 @@ $lang->project->treeLevel = array(); $lang->project->treeLevel['root'] = 'Show Root'; $lang->project->treeLevel['story'] = 'Show Story'; $lang->project->treeLevel['task'] = 'Show Task'; +$lang->project->treeLevel['all'] = 'Show All'; diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php index 3ec532aab3..7d5ccbaf9c 100644 --- a/module/project/lang/zh-tw.php +++ b/module/project/lang/zh-tw.php @@ -56,7 +56,7 @@ $lang->project->start = '開始'; $lang->project->activate = '激活'; $lang->project->putoff = '延期'; $lang->project->suspend = '掛起'; -$lang->project->close = '結束'; +$lang->project->close = '關閉'; $lang->project->typeList['sprint'] = "短期$lang->projectCommon"; $lang->project->typeList['waterfall'] = "長期$lang->projectCommon"; @@ -260,4 +260,4 @@ $lang->project->treeLevel = array(); $lang->project->treeLevel['root'] = '全部摺疊'; $lang->project->treeLevel['story'] = '顯示需求'; $lang->project->treeLevel['task'] = '顯示任務'; - +$lang->project->treeLevel['all'] = '全部展開'; diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index 3804f573e9..1ae247d4e0 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -115,3 +115,4 @@ $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'; $lang->upgrade->fromVersions['9_0_beta'] = '9.0.beta'; +$lang->upgrade->fromVersions['9_0'] = '9.0'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index ca18b2f08f..68dadac9da 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -115,3 +115,4 @@ $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'; $lang->upgrade->fromVersions['9_0_beta'] = '9.0.beta'; +$lang->upgrade->fromVersions['9_0'] = '9.0'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 760c68b645..9a4d147776 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -115,3 +115,4 @@ $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'; $lang->upgrade->fromVersions['9_0_beta'] = '9.0.beta'; +$lang->upgrade->fromVersions['9_0'] = '9.0'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index c1399728f5..e74624cc40 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -164,6 +164,8 @@ class upgradeModel extends model case '9_0_beta': $this->execSQL($this->getUpgradeFile('9.0.beta')); $this->adjustPriv9_0(); + case '9_0': + $this->fixProjectProductData(); } $this->deletePatch(); @@ -251,6 +253,7 @@ class upgradeModel extends model case '8_4': case '8_4_1': $confirmContent .= file_get_contents($this->getUpgradeFile('8.4.1')); case '9_0_beta': $confirmContent .= file_get_contents($this->getUpgradeFile('9.0.beta')); + case '9_0': } return str_replace('zt_', $this->config->db->prefix, $confirmContent); }