From f0d0183987ca52a992f7d181b3d2e81a7173e42d Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Fri, 29 Jan 2021 09:16:10 +0800 Subject: [PATCH] * Finish task#9092. --- module/misc/control.php | 9 ++++++++- module/misc/lang/de.php | 9 +++++---- module/misc/lang/en.php | 9 +++++---- module/misc/lang/fr.php | 9 +++++---- module/misc/lang/vi.php | 9 +++++---- module/misc/lang/zh-cn.php | 9 +++++---- module/misc/lang/zh-tw.php | 26 ++++++++++++++++++-------- 7 files changed, 51 insertions(+), 29 deletions(-) diff --git a/module/misc/control.php b/module/misc/control.php index 3c37271577..48758a2982 100644 --- a/module/misc/control.php +++ b/module/misc/control.php @@ -66,11 +66,18 @@ class misc extends control public function checkUpdate($sn = '') { session_write_close(); + + $website = $this->lang->misc->api; + + if(isset($this->config->qcVersion)) $website = $this->lang->misc->qucheng; + if(isset($this->config->isINT)) $website = $this->lang->misc->enApi; + $source = isset($this->config->qcVersion) ? 'qucheng' : 'zentao'; $lang = str_replace('-', '_', $this->app->getClientLang()); - $link = $this->lang->misc->api . "/updater-getLatest-{$this->config->version}-$source-$lang.html"; + $link = $website . "/updater-getLatest-{$this->config->version}-$source-$lang.html"; $latestVersionList = common::http($link); + $this->loadModel('setting')->setItem('system.common.global.latestVersionList', $latestVersionList); } diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php index 3e9a79f054..139326f469 100644 --- a/module/misc/lang/de.php +++ b/module/misc/lang/de.php @@ -10,10 +10,11 @@ * @link http://www.zentao.net */ $lang->misc = new stdclass(); -$lang->misc->common = 'Sonstiges'; -$lang->misc->ping = 'Ping'; -$lang->misc->api = 'https://api.zentao.net'; -$lang->misc->enApi = 'https://api.zentao.pm'; +$lang->misc->common = 'Sonstiges'; +$lang->misc->ping = 'Ping'; +$lang->misc->api = 'https://api.zentao.net'; +$lang->misc->enApi = 'https://api.zentao.pm'; +$lang->misc->qucheng = 'https://www.qucheng.com'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = 'Version %s'; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 6cc6fcfebe..1c3692d765 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -10,10 +10,11 @@ * @link http://www.zentao.net */ $lang->misc = new stdclass(); -$lang->misc->common = 'Misc'; -$lang->misc->ping = 'Ping'; -$lang->misc->api = 'https://api.zentao.net'; -$lang->misc->enApi = 'https://api.zentao.pm'; +$lang->misc->common = 'Misc'; +$lang->misc->ping = 'Ping'; +$lang->misc->api = 'https://api.zentao.net'; +$lang->misc->enApi = 'https://api.zentao.pm'; +$lang->misc->qucheng = 'https://www.qucheng.com'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = 'Version %s'; diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php index 793a448421..68b7843a05 100644 --- a/module/misc/lang/fr.php +++ b/module/misc/lang/fr.php @@ -10,10 +10,11 @@ * @link https://www.zentao.pm */ $lang->misc = new stdclass(); -$lang->misc->common = 'Misc'; -$lang->misc->ping = 'Ping'; -$lang->misc->api = 'https://api.zentao.pm'; -$lang->misc->enApi = 'https://api.zentao.pm'; +$lang->misc->common = 'Misc'; +$lang->misc->ping = 'Ping'; +$lang->misc->api = 'https://api.zentao.net'; +$lang->misc->enApi = 'https://api.zentao.pm'; +$lang->misc->qucheng = 'https://www.qucheng.com'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = 'Version %s'; diff --git a/module/misc/lang/vi.php b/module/misc/lang/vi.php index 9be67c9284..bea88131e9 100644 --- a/module/misc/lang/vi.php +++ b/module/misc/lang/vi.php @@ -10,10 +10,11 @@ * @link http://www.zentao.net */ $lang->misc = new stdclass(); -$lang->misc->common = 'Khác'; -$lang->misc->ping = 'Ping'; -$lang->misc->api = 'https://api.zentao.net'; -$lang->misc->enApi = 'https://api.zentao.pm'; +$lang->misc->common = 'Khác'; +$lang->misc->ping = 'Ping'; +$lang->misc->api = 'https://api.zentao.net'; +$lang->misc->enApi = 'https://api.zentao.pm'; +$lang->misc->qucheng = 'https://www.qucheng.com'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = 'Phiên bản %s'; diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 530a592574..a8fa707a1f 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -10,10 +10,11 @@ * @link http://www.zentao.net */ $lang->misc = new stdclass(); -$lang->misc->common = '杂项'; -$lang->misc->ping = '防超时'; -$lang->misc->api = 'https://api.zentao.net'; -$lang->misc->enApi = 'https://api.zentao.pm'; +$lang->misc->common = '杂项'; +$lang->misc->ping = '防超时'; +$lang->misc->api = 'https://api.zentao.net'; +$lang->misc->enApi = 'https://api.zentao.pm'; +$lang->misc->qucheng = 'https://www.qucheng.com'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = '版本%s'; diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php index 7b7aecd6a9..29c3eab4dd 100644 --- a/module/misc/lang/zh-tw.php +++ b/module/misc/lang/zh-tw.php @@ -10,10 +10,11 @@ * @link http://www.zentao.net */ $lang->misc = new stdclass(); -$lang->misc->common = '雜項'; -$lang->misc->ping = '防超時'; -$lang->misc->api = 'https://api.zentao.net'; -$lang->misc->enApi = 'https://api.zentao.pm'; +$lang->misc->common = '雜項'; +$lang->misc->ping = '防超時'; +$lang->misc->api = 'https://api.zentao.net'; +$lang->misc->enApi = 'https://api.zentao.pm'; +$lang->misc->qucheng = 'https://www.qucheng.com'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = '版本%s'; @@ -86,8 +87,12 @@ $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'; $lang->misc->releaseDate['12.5.stable'] = '2020-11-19'; +$lang->misc->releaseDate['20.0.alpha1'] = '2020-10-30'; $lang->misc->releaseDate['12.4.4'] = '2020-10-30'; $lang->misc->releaseDate['12.4.3'] = '2020-10-13'; $lang->misc->releaseDate['12.4.2'] = '2020-09-18'; @@ -137,13 +142,18 @@ $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' => '

增加項目集和項目概念

將原項目概念變為迭代或階段概念

增加瀑布開發模板

'); + $lang->misc->feature->all['12.5.1'][] = array('title' => '修復漏洞。', 'desc' => ''); $lang->misc->feature->all['12.5.stable'][] = array('title' => '解決bug，完成高優先順序需求。', 'desc' => ''); -$lang->misc->feature->all['12.4.4'][] = array('title' => '兼容專業版和企業版', 'desc' => ''); -$lang->misc->feature->all['12.4.3'][] = array('title' => '修復Bug', 'desc' => ''); -$lang->misc->feature->all['12.4.2'][] = array('title' => '修復Bug', 'desc' => ''); -$lang->misc->feature->all['12.4.1'][] = array('title' => '修復Bug', 'desc' => ''); +$lang->misc->feature->all['12.4.4'][] = array('title'=>'兼容專業版和企業版', 'desc' => ''); +$lang->misc->feature->all['12.4.3'][] = array('title'=>'修復Bug', 'desc' => ''); +$lang->misc->feature->all['12.4.2'][] = array('title'=>'修復Bug', 'desc' => ''); +$lang->misc->feature->all['12.4.1'][] = array('title'=>'修復Bug', 'desc' => ''); $lang->misc->feature->all['12.4.stable'][] = array('title'=>'修復Bug', 'desc' => '');