diff --git a/config/config.php b/config/config.php index 22a08b57a1..149c92900b 100644 --- a/config/config.php +++ b/config/config.php @@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '15.0.rc1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '15.0.rc2'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. $config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. $config->cookieLife = time() + 2592000; // Cookie的生存时间。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/misc/lang/de.php b/module/misc/lang/de.php index 2f4dac3055..0127d934ac 100644 --- a/module/misc/lang/de.php +++ b/module/misc/lang/de.php @@ -84,6 +84,8 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = 'Letzte Version'; $lang->misc->feature->detailed = 'Details'; +$lang->misc->releaseDate['15.0.rc2'] = '2021-04-09'; +$lang->misc->releaseDate['15.0.rc1'] = '2021-04-05'; $lang->misc->releaseDate['12.5.3'] = '2021-01-06'; $lang->misc->releaseDate['12.5.2'] = '2020-12-18'; $lang->misc->releaseDate['12.5.1'] = '2020-11-30'; @@ -138,6 +140,8 @@ $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['15.0.rc2'][] = array('title' => 'Fix Bug.', 'desc' => ''); +$lang->misc->feature->all['15.0.rc1'][] = array('title' => 'Upgrade to 15,reframe menu, add program.', 'desc' => ''); $lang->misc->feature->all['12.5.3'][] = array('title' => 'Adjust annual data.', 'desc' => ''); $lang->misc->feature->all['12.5.2'][] = array('title' => 'Fix Bug', 'desc' => ''); $lang->misc->feature->all['12.5.1'][] = array('title' => 'Fix Bug', 'desc' => ''); diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 8bf4028bbc..bb1e093367 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -84,6 +84,8 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = 'Latest Version'; $lang->misc->feature->detailed = 'Detail'; +$lang->misc->releaseDate['15.0.rc2'] = '2021-04-09'; +$lang->misc->releaseDate['15.0.rc1'] = '2021-04-05'; $lang->misc->releaseDate['12.5.3'] = '2021-01-06'; $lang->misc->releaseDate['12.5.2'] = '2020-12-18'; $lang->misc->releaseDate['12.5.1'] = '2020-11-30'; @@ -138,6 +140,8 @@ $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['15.0.rc2'][] = array('title' => 'Fix Bug.', 'desc' => ''); +$lang->misc->feature->all['15.0.rc1'][] = array('title' => 'Upgrade to 15,reframe menu, add program.', 'desc' => ''); $lang->misc->feature->all['12.5.3'][] = array('title' => 'Adjust annual data.', 'desc' => ''); $lang->misc->feature->all['12.5.2'][] = array('title' => 'Fix Bug', 'desc' => ''); $lang->misc->feature->all['12.5.1'][] = array('title' => 'Fix Bug', 'desc' => ''); diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php index 9e31fca34d..2d0458f56a 100644 --- a/module/misc/lang/fr.php +++ b/module/misc/lang/fr.php @@ -84,6 +84,8 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = 'Dernière Version'; $lang->misc->feature->detailed = 'Détail'; +$lang->misc->releaseDate['15.0.rc2'] = '2021-04-09'; +$lang->misc->releaseDate['15.0.rc1'] = '2021-04-05'; $lang->misc->releaseDate['12.5.3'] = '2021-01-06'; $lang->misc->releaseDate['12.5.2'] = '2020-12-18'; $lang->misc->releaseDate['12.5.1'] = '2020-11-30'; @@ -138,6 +140,8 @@ $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['15.0.rc2'][] = array('title' => 'Fix Bug.', 'desc' => ''); +$lang->misc->feature->all['15.0.rc1'][] = array('title' => 'Upgrade to 15,reframe menu, add program.', 'desc' => ''); $lang->misc->feature->all['12.5.3'][] = array('title' => 'Adjust annual data.', 'desc' => ''); $lang->misc->feature->all['12.5.2'][] = array('title' => 'Fix Bug', 'desc' => ''); $lang->misc->feature->all['12.5.1'][] = array('title' => 'Fix Bug', 'desc' => ''); diff --git a/module/misc/lang/vi.php b/module/misc/lang/vi.php index 51de44ed5b..557f27373b 100644 --- a/module/misc/lang/vi.php +++ b/module/misc/lang/vi.php @@ -84,6 +84,8 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = 'Latest Version'; $lang->misc->feature->detailed = 'Chi tiết'; +$lang->misc->releaseDate['15.0.rc2'] = '2021-04-09'; +$lang->misc->releaseDate['15.0.rc1'] = '2021-04-05'; $lang->misc->releaseDate['12.5.3'] = '2021-01-06'; $lang->misc->releaseDate['12.5.2'] = '2020-12-18'; $lang->misc->releaseDate['12.5.1'] = '2020-11-30'; @@ -138,6 +140,8 @@ $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['15.0.rc2'][] = array('title' => 'Fix Bug.', 'desc' => ''); +$lang->misc->feature->all['15.0.rc1'][] = array('title' => 'Upgrade to 15,reframe menu, add program.', 'desc' => ''); $lang->misc->feature->all['12.5.3'][] = array('title' => 'Adjust annual data.', 'desc' => ''); $lang->misc->feature->all['12.5.2'][] = array('title' => 'Fix Bug', 'desc' => ''); $lang->misc->feature->all['12.5.1'][] = array('title' => 'Fix Bug', 'desc' => ''); diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 78cad4e023..eeace1960c 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -84,6 +84,8 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = '最新版本'; $lang->misc->feature->detailed = '详情'; +$lang->misc->releaseDate['15.0.rc2'] = '2021-04-09'; +$lang->misc->releaseDate['15.0.rc1'] = '2021-04-05'; $lang->misc->releaseDate['12.5.3'] = '2021-01-06'; $lang->misc->releaseDate['12.5.2'] = '2020-12-18'; $lang->misc->releaseDate['12.5.1'] = '2020-11-30'; @@ -138,6 +140,8 @@ $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['15.0.rc2'][] = array('title' => '修复Bug,优化界面交互', 'desc' => ''); +$lang->misc->feature->all['15.0.rc1'][] = array('title' => '升级到15版本,重构导航、文档库,增加项目集管理', 'desc' => ''); $lang->misc->feature->all['12.5.3'][] = array('title' => '优化年度总结', 'desc' => ''); $lang->misc->feature->all['12.5.2'][] = array('title' => '修复Bug', 'desc' => ''); $lang->misc->feature->all['12.5.1'][] = array('title' => '修复漏洞。', 'desc' => ''); diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index 1d3010332f..2eede042cb 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['12_5_2'] = '12.5.2'; $lang->upgrade->fromVersions['12_5_3'] = '12.5.3'; +$lang->upgrade->fromVersions['15_0_rc1'] = '15.0.rc1';