diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 24d3df9738..87513e8af7 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -86,6 +86,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = '最新版本'; $lang->misc->feature->detailed = '详情'; +$lang->misc->releaseDate['20.0.beta3'] = '2020-01-08'; $lang->misc->releaseDate['20.0.beta2'] = '2020-12-18'; $lang->misc->releaseDate['20.0.beta1'] = '2020-11-30'; $lang->misc->releaseDate['12.5.1'] = '2020-11-30'; @@ -140,6 +141,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22'; $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; +$lang->misc->feature->all['20.0.beta3'][] = array('title'=>'优化导航交互,增强用户体验', 'desc' => ''); $lang->misc->feature->all['20.0.beta2'][] = array('title'=>'重构组织导航,修复bug,完善细节', 'desc' => ''); $lang->misc->feature->all['20.0.beta1'][] = array('title'=>'禅道20beta版本,修复bug,完善细节', 'desc' => ''); $lang->misc->feature->all['20.0.alpha1'][] = array('title'=>'禅道20版本大更新,重构导航,增加瀑布模型', 'desc' => '

增加项目集和项目概念

将原项目概念变为迭代或阶段概念

增加瀑布开发模板

'); diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index 4cefe7c97d..eb9082d973 100644 --- a/module/upgrade/lang/version.php +++ b/module/upgrade/lang/version.php @@ -133,3 +133,4 @@ $lang->upgrade->fromVersions['12_5'] = '12.5'; $lang->upgrade->fromVersions['12_5_1'] = '12.5.1'; $lang->upgrade->fromVersions['20_0_alpha1'] = '20.0.alpha1'; $lang->upgrade->fromVersions['20_0_beta1'] = '20.0.beta1'; +$lang->upgrade->fromVersions['20_0_beta2'] = '20.0.beta2'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 1c50886efa..041cdab3bc 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -655,10 +655,10 @@ class upgradeModel extends model $this->processBuildTable(); $this->processSprintConcept(); $this->appendExec('20_0_beta1'); - case '20_0_beta3': - $this->saveLogs('Execute 20_0_beta3'); + case '20_0_beta2': + $this->saveLogs('Execute 20_0_beta2'); $this->adjustBudget(); - $this->appendExec('20_0_beta3'); + $this->appendExec('20_0_beta2'); } $this->deletePatch(); @@ -844,6 +844,7 @@ class upgradeModel extends model case '20_0_alpha' : $confirmContent .= file_get_contents($this->getUpgradeFile('20.0.alpha')); case '20_0_alpha1': $confirmContent .= file_get_contents($this->getUpgradeFile('20.0.alpha1')); case '20_0_beta1' : $confirmContent .= file_get_contents($this->getUpgradeFile('20.0.beta1')); + case '20_0_beta2' : $confirmContent .= file_get_contents($this->getUpgradeFile('20.0.beta2')); } return str_replace('zt_', $this->config->db->prefix, $confirmContent); }