From 55560f0f056446de0757d712d745fbfae6765dcf Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 6 May 2021 10:01:45 +0800 Subject: [PATCH] * Finish task #37924. --- module/upgrade/control.php | 15 ++++++++++++++- module/upgrade/lang/de.php | 4 +++- module/upgrade/lang/en.php | 4 +++- module/upgrade/lang/fr.php | 4 +++- module/upgrade/lang/vi.php | 4 +++- module/upgrade/lang/zh-cn.php | 4 +++- module/upgrade/view/to15guide.html.php | 17 ++++++++++++++++- 7 files changed, 45 insertions(+), 7 deletions(-) diff --git a/module/upgrade/control.php b/module/upgrade/control.php index f51da2b2be..85bcbf4b8f 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -161,7 +161,20 @@ class upgrade extends control if($mode == 'new') $this->locate(inlink('mergeTips')); } - $this->view->title = $this->lang->upgrade->to15Guide; + if(isset($this->config->bizVersion)) + { + $title = $this->lang->upgrade->toBIZ5Guide; + } + elseif(isset($this->config->proVersion)) + { + $title = $this->lang->upgrade->toPRO10Guide; + } + else + { + $title = $this->lang->upgrade->toPMS15Guide; + } + + $this->view->title = $title; $this->display(); } diff --git a/module/upgrade/lang/de.php b/module/upgrade/lang/de.php index 880a556a40..37b494c0e4 100644 --- a/module/upgrade/lang/de.php +++ b/module/upgrade/lang/de.php @@ -51,7 +51,9 @@ $lang->upgrade->noticeSQL = 'Your database is inconsistent with the standard $lang->upgrade->afterDeleted = 'File is not deleted. Please refresh after you delete it.'; $lang->upgrade->mergeProgram = 'Data Merge'; $lang->upgrade->mergeTips = 'Data Migration Tips'; -$lang->upgrade->to15Guide = 'ZenTao open source version 15.0.beta1 upgrade'; +$lang->upgrade->toPMS15Guide = 'ZenTao open source version 15.0.beta1 upgrade'; +$lang->upgrade->toPRO10Guide = 'ZenTao profession version 10.0.rc1 upgrade'; +$lang->upgrade->toBIZ5Guide = 'ZenTao enterprise version 5.0.rc1 upgrade'; $lang->upgrade->to15Desc = <<Dear users, ZenTao has made adjustments to navigation and concepts since version 15. The main changes are as follows:

    diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index a6063c0048..27aeac70be 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -53,7 +53,9 @@ $lang->upgrade->noticeSQL = 'Your database is inconsistent with the standard $lang->upgrade->afterDeleted = 'File is not deleted. Please refresh after you delete it.'; $lang->upgrade->mergeProgram = 'Data Merge'; $lang->upgrade->mergeTips = 'Data Migration Tips'; -$lang->upgrade->to15Guide = 'ZenTao open source version 15.0 upgrade'; +$lang->upgrade->toPMS15Guide = 'ZenTao open source version 15.0.beta1 upgrade'; +$lang->upgrade->toPRO10Guide = 'ZenTao profession version 10.0.rc1 upgrade'; +$lang->upgrade->toBIZ5Guide = 'ZenTao enterprise version 5.0.rc1 upgrade'; $lang->upgrade->to15Desc = <<Dear users, ZenTao has made adjustments to navigation and concepts since version 15. The main changes are as follows:

      diff --git a/module/upgrade/lang/fr.php b/module/upgrade/lang/fr.php index f99968df42..8488029881 100644 --- a/module/upgrade/lang/fr.php +++ b/module/upgrade/lang/fr.php @@ -52,7 +52,9 @@ $lang->upgrade->noticeSQL = 'Votre base de donnée est inconsistente avec le $lang->upgrade->afterDeleted = "Le fichier n'est pas supprimé. Recommencez après l'avoir supprimé."; $lang->upgrade->mergeProgram = 'Data Merge'; $lang->upgrade->mergeTips = 'Data Migration Tips'; -$lang->upgrade->to15Guide = 'ZenTao open source version 15.0.beta1 upgrade'; +$lang->upgrade->toPMS15Guide = 'ZenTao open source version 15.0.beta1 upgrade'; +$lang->upgrade->toPRO10Guide = 'ZenTao profession version 10.0.rc1 upgrade'; +$lang->upgrade->toBIZ5Guide = 'ZenTao enterprise version 5.0.rc1 upgrade'; $lang->upgrade->to15Desc = <<Dear users, ZenTao has made adjustments to navigation and concepts since version 15. The main changes are as follows:

        diff --git a/module/upgrade/lang/vi.php b/module/upgrade/lang/vi.php index 88a6843562..8ab41b28ea 100644 --- a/module/upgrade/lang/vi.php +++ b/module/upgrade/lang/vi.php @@ -52,7 +52,9 @@ $lang->upgrade->noticeSQL = 'Your database is inconsistent with the standard $lang->upgrade->afterDeleted = 'File không là deleted. Vui lòng refresh after you xóa it.'; $lang->upgrade->mergeProgram = 'Data Merge'; $lang->upgrade->mergeTips = 'Data Migration Tips'; -$lang->upgrade->to15Guide = 'ZenTao open source version 15.0.beta1 upgrade'; +$lang->upgrade->toPMS15Guide = 'ZenTao open source version 15.0.beta1 upgrade'; +$lang->upgrade->toPRO10Guide = 'ZenTao profession version 10.0.rc1 upgrade'; +$lang->upgrade->toBIZ5Guide = 'ZenTao enterprise version 5.0.rc1 upgrade'; $lang->upgrade->to15Desc = <<Dear users, ZenTao has made adjustments to navigation and concepts since version 15. The main changes are as follows:

          diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 99f08afbc4..c7f7733811 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -53,7 +53,9 @@ $lang->upgrade->noticeSQL = '检查到你的数据库跟标准不一致， $lang->upgrade->afterDeleted = '以上文件未能删除， 删除后刷新！'; $lang->upgrade->mergeProgram = '数据迁移'; $lang->upgrade->mergeTips = '数据迁移提示'; -$lang->upgrade->to15Guide = '禅道开源版15版本升级'; +$lang->upgrade->toPMS15Guide = '禅道开源版15版本升级'; +$lang->upgrade->toPRO10Guide = '禅道专业版10版本升级'; +$lang->upgrade->toBIZ5Guide = '禅道企业版5版本升级'; $lang->upgrade->to15Desc = <<尊敬的用户，禅道从15版本开始对导航和概念做了调整，主要改动如下：

            diff --git a/module/upgrade/view/to15guide.html.php b/module/upgrade/view/to15guide.html.php index 39c5e9b440..b1bac17b6c 100644 --- a/module/upgrade/view/to15guide.html.php +++ b/module/upgrade/view/to15guide.html.php @@ -14,7 +14,22 @@
            -
            upgrade->to15Guide;?>
            +
            + bizVersion)) + { + echo $lang->upgrade->toBIZ5Guide; + } + elseif(isset($config->proVersion)) + { + echo $lang->upgrade->toPRO10Guide; + } + else + { + echo $lang->upgrade->toPMS15Guide; + } + ?> +
            upgrade->to15Desc;?>