From 8601b6e33632ac8d734397f4c08efcffc81d94aa Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Wed, 3 Mar 2021 11:02:05 +0800 Subject: [PATCH] * Finish task #36373. --- module/upgrade/lang/de.php | 38 +++++++++++++++++++------ module/upgrade/lang/en.php | 39 ++++++++++++++++++++------ module/upgrade/lang/fr.php | 39 ++++++++++++++++++++------ module/upgrade/lang/vi.php | 23 ++++++++++++++- module/upgrade/lang/zh-cn.php | 34 +++++++++++++--------- module/upgrade/view/to15guide.html.php | 9 ++++-- 6 files changed, 138 insertions(+), 44 deletions(-) diff --git a/module/upgrade/lang/de.php b/module/upgrade/lang/de.php index 8a6cfad844..6f3c02fc7b 100644 --- a/module/upgrade/lang/de.php +++ b/module/upgrade/lang/de.php @@ -9,14 +9,15 @@ * @version $Id: en.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $ * @link http://www.zentao.net */ -$lang->upgrade->common = 'Upgrade'; -$lang->upgrade->result = 'Ergebnis'; -$lang->upgrade->fail = 'Fehlgeschlagen'; -$lang->upgrade->successTip = 'Successed'; -$lang->upgrade->success = 'Erfolgreich'; -$lang->upgrade->tohome = 'Home'; -$lang->upgrade->license = 'Zentao PMS nutzt jetzt Z PUBLIC LICENSE(ZPL) 1.2.'; -$lang->upgrade->warnning = 'Warnung!'; +$lang->upgrade->common = 'Upgrade'; +$lang->upgrade->start = 'Start'; +$lang->upgrade->result = 'Ergebnis'; +$lang->upgrade->fail = 'Fehlgeschlagen'; +$lang->upgrade->successTip = 'Successed'; +$lang->upgrade->success = 'Erfolgreich'; +$lang->upgrade->tohome = 'Home'; +$lang->upgrade->license = 'Zentao PMS nutzt jetzt Z PUBLIC LICENSE(ZPL) 1.2.'; +$lang->upgrade->warnning = 'Warnung!'; $lang->upgrade->checkExtension = 'Erweiterung prüfen'; $lang->upgrade->consistency = 'Check Consistency'; $lang->upgrade->warnningContent = <<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->to20Demo = 'View version 20 of the demo'; +$lang->upgrade->to15Guide = 'ZenTao open source version 15.0.beta1 upgrade'; +$lang->upgrade->to15Desc = <<Dear users, ZenTao has made adjustments to navigation and concepts since version 15. The main changes are as follows:

+
    +

  1. Added the concept of program. A program set can include multiple products and multiple projects.

    2. +

  2. Subdivided the concept of project and iteration, a project can contain multiple iterations.

    3. +

  3. The navigation adds a left menu and supports multi-page operations.

    4. +
+
+

You can experience the latest version of the function online to decide whether to enable the mode: Demo

+
+

How do you plan to use the new version of ZenTao?

+EOD; + +$lang->upgrade->to15Mode['classic'] = 'Keep the old version'; +$lang->upgrade->to15Mode['new'] = 'New program management mode'; + +$lang->upgrade->selectedModeTips['classic'] = 'You can also switch to the new program set management mode in the background-Customize in the future.'; +$lang->upgrade->selectedModeTips['new'] = 'Switching to the program management mode requires merging the previous data, and the system will guide you to complete this operation.'; + $lang->upgrade->demoURL = 'http://zentao20.demo.zentao.net'; $lang->upgrade->videoURL = 'https://qc.zentao.net/zentao20.mp4'; $lang->upgrade->to20Tips = 'Zentao 20 upgrade tips'; diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index f5704a65ab..a7951a08fa 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -9,14 +9,15 @@ * @version $Id: en.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $ * @link http://www.zentao.net */ -$lang->upgrade->common = 'Update'; -$lang->upgrade->result = 'Result'; -$lang->upgrade->fail = 'Failed'; -$lang->upgrade->successTip = 'Successed'; -$lang->upgrade->success = "

Congratulations!

Your ZenTao is updated.

"; -$lang->upgrade->tohome = 'Visit ZenTao'; -$lang->upgrade->license = 'ZenTao is under Z PUBLIC LICENSE(ZPL) 1.2.'; -$lang->upgrade->warnning = 'Warning!'; +$lang->upgrade->common = 'Update'; +$lang->upgrade->start = 'Start'; +$lang->upgrade->result = 'Result'; +$lang->upgrade->fail = 'Failed'; +$lang->upgrade->successTip = 'Successed'; +$lang->upgrade->success = "

Congratulations!

Your ZenTao is updated.

"; +$lang->upgrade->tohome = 'Visit ZenTao'; +$lang->upgrade->license = 'ZenTao is under Z PUBLIC LICENSE(ZPL) 1.2.'; +$lang->upgrade->warnning = 'Warning!'; $lang->upgrade->checkExtension = 'Check Extensions'; $lang->upgrade->consistency = 'Check Consistency'; $lang->upgrade->warnningContent = <<upgrade->setStatusFile = '

Please complete the following actions<
  • Or delete "%s" and create ok.txt and leave it blank.

    • I have read and done as instructed above. Continue upgrading.

    '; + $lang->upgrade->selectVersion = 'Version'; $lang->upgrade->continue = 'Continue'; $lang->upgrade->noteVersion = "Select the compatible version, or it might cause data loss."; @@ -50,7 +52,26 @@ $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->to20Demo = 'View version 20 of the demo'; +$lang->upgrade->to15Guide = 'ZenTao open source version 15.0.beta1 upgrade'; +$lang->upgrade->to15Desc = <<Dear users, ZenTao has made adjustments to navigation and concepts since version 15. The main changes are as follows:

    +
      +

    1. Added the concept of program. A program set can include multiple products and multiple projects.

      2. +

    2. Subdivided the concept of project and iteration, a project can contain multiple iterations.

      3. +

    3. The navigation adds a left menu and supports multi-page operations.

      4. +
    +
    +

    You can experience the latest version of the function online to decide whether to enable the mode: Demo

    +
    +

    How do you plan to use the new version of ZenTao?

    +EOD; + +$lang->upgrade->to15Mode['classic'] = 'Keep the old version'; +$lang->upgrade->to15Mode['new'] = 'New program management mode'; + +$lang->upgrade->selectedModeTips['classic'] = 'You can also switch to the new program set management mode in the background-Customize in the future.'; +$lang->upgrade->selectedModeTips['new'] = 'Switching to the program management mode requires merging the previous data, and the system will guide you to complete this operation.'; + $lang->upgrade->demoURL = 'http://zentao20.demo.zentao.net'; $lang->upgrade->videoURL = 'https://qc.zentao.net/zentao20.mp4'; $lang->upgrade->to20Tips = 'Zentao 20 upgrade tips'; diff --git a/module/upgrade/lang/fr.php b/module/upgrade/lang/fr.php index f34b8f1776..5000a880ce 100644 --- a/module/upgrade/lang/fr.php +++ b/module/upgrade/lang/fr.php @@ -9,14 +9,15 @@ * @version $Id: en.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $ * @link https://www.zentao.pm */ -$lang->upgrade->common = 'Mise à jour'; -$lang->upgrade->result = 'Résultat'; -$lang->upgrade->fail = 'Echec'; -$lang->upgrade->successTip = 'Mise à jour effectuée'; -$lang->upgrade->success = 'Mise à jour effectuée'; -$lang->upgrade->tohome = 'Visitez ZenTao'; -$lang->upgrade->license = 'ZenTao est sous Z PUBLIC LICENSE(ZPL) 1.2.'; -$lang->upgrade->warnning = 'Attention!'; +$lang->upgrade->common = 'Mise à jour'; +$lang->upgrade->start = 'Start'; +$lang->upgrade->result = 'Résultat'; +$lang->upgrade->fail = 'Echec'; +$lang->upgrade->successTip = 'Mise à jour effectuée'; +$lang->upgrade->success = 'Mise à jour effectuée'; +$lang->upgrade->tohome = 'Visitez ZenTao'; +$lang->upgrade->license = 'ZenTao est sous Z PUBLIC LICENSE(ZPL) 1.2.'; +$lang->upgrade->warnning = 'Attention!'; $lang->upgrade->checkExtension = 'Vérifiez Extensions'; $lang->upgrade->consistency = 'Vérifiez Consistence'; $lang->upgrade->warnningContent = <<upgrade->setStatusFile = '

    Accomplissez les actions suivantes

    Ou supprimez "%s" et créez ok.txt et laissez ce fichier vide.

    Vous avez lu et accompli toutes les actions précédentes. Continuez la mise à jour.

    '; + $lang->upgrade->selectVersion = 'Version'; $lang->upgrade->continue = 'Continuer'; $lang->upgrade->noteVersion = "Sélectionnez une version compatible où vous pourriez perdre des données."; @@ -50,7 +52,26 @@ $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->to20Demo = 'View version 20 of the demo'; +$lang->upgrade->to15Guide = 'ZenTao open source version 15.0.beta1 upgrade'; +$lang->upgrade->to15Desc = <<Dear users, ZenTao has made adjustments to navigation and concepts since version 15. The main changes are as follows:

    +
      +

    1. Added the concept of program. A program set can include multiple products and multiple projects.

      2. +

    2. Subdivided the concept of project and iteration, a project can contain multiple iterations.

      3. +

    3. The navigation adds a left menu and supports multi-page operations.

      4. +
    +
    +

    You can experience the latest version of the function online to decide whether to enable the mode: Demo

    +
    +

    How do you plan to use the new version of ZenTao?

    +EOD; + +$lang->upgrade->to15Mode['classic'] = 'Keep the old version'; +$lang->upgrade->to15Mode['new'] = 'New program management mode'; + +$lang->upgrade->selectedModeTips['classic'] = 'You can also switch to the new program set management mode in the background-Customize in the future.'; +$lang->upgrade->selectedModeTips['new'] = 'Switching to the program management mode requires merging the previous data, and the system will guide you to complete this operation.'; + $lang->upgrade->demoURL = 'http://zentao20.demo.zentao.net'; $lang->upgrade->videoURL = 'https://qc.zentao.net/zentao20.mp4'; $lang->upgrade->to20Tips = 'Zentao 20 upgrade tips'; diff --git a/module/upgrade/lang/vi.php b/module/upgrade/lang/vi.php index 1f99746152..811f015268 100644 --- a/module/upgrade/lang/vi.php +++ b/module/upgrade/lang/vi.php @@ -10,6 +10,7 @@ * @link http://www.zentao.net */ $lang->upgrade->common = 'Cập nhật'; +$lang->upgrade->start = 'Start'; $lang->upgrade->result = 'Kết quả'; $lang->upgrade->fail = 'Thất bại'; $lang->upgrade->successTip = 'Erfolgreich'; @@ -37,6 +38,7 @@ $lang->upgrade->setStatusFile = '

    Please complete the following actions<
  • Or xóa "%s" and create ok.txt and leave it blank.

    • I have read and done as instructed above. Continue upgrading.

    '; + $lang->upgrade->selectVersion = 'Phiên bản'; $lang->upgrade->continue = 'Tiếp tục'; $lang->upgrade->noteVersion = "Chọn the compatible version, or it might cause data loss."; @@ -50,7 +52,26 @@ $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->to20Demo = 'View version 20 of the demo'; +$lang->upgrade->to15Guide = 'ZenTao open source version 15.0.beta1 upgrade'; +$lang->upgrade->to15Desc = <<Dear users, ZenTao has made adjustments to navigation and concepts since version 15. The main changes are as follows:

    +
      +

    1. Added the concept of program. A program set can include multiple products and multiple projects.

      2. +

    2. Subdivided the concept of project and iteration, a project can contain multiple iterations.

      3. +

    3. The navigation adds a left menu and supports multi-page operations.

      4. +
    +
    +

    You can experience the latest version of the function online to decide whether to enable the mode: Demo

    +
    +

    How do you plan to use the new version of ZenTao?

    +EOD; + +$lang->upgrade->to15Mode['classic'] = 'Keep the old version'; +$lang->upgrade->to15Mode['new'] = 'New program management mode'; + +$lang->upgrade->selectedModeTips['classic'] = 'You can also switch to the new program set management mode in the background-Customize in the future.'; +$lang->upgrade->selectedModeTips['new'] = 'Switching to the program management mode requires merging the previous data, and the system will guide you to complete this operation.'; + $lang->upgrade->demoURL = 'http://zentao20.demo.zentao.net'; $lang->upgrade->videoURL = 'https://qc.zentao.net/zentao20.mp4'; $lang->upgrade->to20Tips = 'Zentao 20 upgrade tips'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 945f9643d5..931fbfbfff 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -9,14 +9,15 @@ * @version $Id: zh-cn.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $ * @link http://www.zentao.net */ -$lang->upgrade->common = '升级'; -$lang->upgrade->result = '升级结果'; -$lang->upgrade->fail = '升级失败'; -$lang->upgrade->successTip = '升级成功'; -$lang->upgrade->success = "

    恭喜您！

    您的禅道已经成功升级。

    "; -$lang->upgrade->tohome = '访问禅道'; -$lang->upgrade->license = '禅道项目管理软件已更换授权协议至 Z PUBLIC LICENSE(ZPL) 1.2'; -$lang->upgrade->warnning = '警告'; +$lang->upgrade->common = '升级'; +$lang->upgrade->start = '开始'; +$lang->upgrade->result = '升级结果'; +$lang->upgrade->fail = '升级失败'; +$lang->upgrade->successTip = '升级成功'; +$lang->upgrade->success = "

    恭喜您！

    您的禅道已经成功升级。

    "; +$lang->upgrade->tohome = '访问禅道'; +$lang->upgrade->license = '禅道项目管理软件已更换授权协议至 Z PUBLIC LICENSE(ZPL) 1.2'; +$lang->upgrade->warnning = '警告'; $lang->upgrade->checkExtension = '检查插件'; $lang->upgrade->consistency = '一致性检查'; $lang->upgrade->warnningContent = <<upgrade->warnningContent = <<zentao.bak EOT; + $lang->upgrade->createFileWinCMD = '打开命令行，执行echo > %s'; $lang->upgrade->createFileLinuxCMD = '在命令行执行: touch %s'; $lang->upgrade->setStatusFile = '

    升级之前请先完成下面的操作：

    @@ -37,6 +39,7 @@ $lang->upgrade->setStatusFile = '

    升级之前请先完成下面的操
  • 或者删掉"%s" 这个文件 ，重新创建一个ok.txt文件，不需要内容。

    • 我已经仔细阅读上面提示且完成上述工作，继续更新

    '; + $lang->upgrade->selectVersion = '选择版本'; $lang->upgrade->continue = '继续'; $lang->upgrade->noteVersion = "务必选择正确的版本，否则会造成数据丢失。"; @@ -50,17 +53,20 @@ $lang->upgrade->noticeSQL = '检查到你的数据库跟标准不一致， $lang->upgrade->afterDeleted = '以上文件未能删除， 删除后刷新！'; $lang->upgrade->mergeProgram = '数据迁移'; $lang->upgrade->mergeTips = '数据迁移提示'; -$lang->upgrade->to15Guide = '升级15版本引导'; +$lang->upgrade->to15Guide = '禅道开源版15.0.beta1升级'; $lang->upgrade->to15Desc = <<尊敬的用户，禅道从15版本开始对导航和概念做了调整，主要改动如下：

      -
    1. 增加了项目集概念。一个项目集可以包括多个产品和多个项目。
      2. -
    2. 细分了项目和迭代概念，一个项目可以包含多个迭代。
      3. -
    3. 导航增加了左侧菜单并支持多页面操作。
      4. +

    4. 增加了项目集概念。一个项目集可以包括多个产品和多个项目。

      5. +

    5. 细分了项目和迭代概念，一个项目可以包含多个迭代。

      6. +

    6. 导航增加了左侧菜单并支持多页面操作。

    -

    您可以在线体验最新版本的功能以决定是否启用的模式：演示链接。

    -

    请问您计划如何使用禅道的新版本呢？

    +
    +

    您可以在线体验最新版本的功能，以决定是否启用的模式：演示demo

    +
    +

    请问您计划如何使用禅道的新版本呢？

    EOD; + $lang->upgrade->mergeProgramDesc = <<接下来我们会把之前历史产品和迭代数据迁移到项目集和项目下，迁移的方案如下：


    方案一：以产品线组织的产品和迭代

    diff --git a/module/upgrade/view/to15guide.html.php b/module/upgrade/view/to15guide.html.php index c2a12b312f..39c5e9b440 100644 --- a/module/upgrade/view/to15guide.html.php +++ b/module/upgrade/view/to15guide.html.php @@ -12,17 +12,22 @@ ?>
    -
    +
    upgrade->to15Guide;?>
    upgrade->to15Desc;?> upgrade->to15Mode, 'classic');?> +

    upgrade->selectedModeTips['classic'];?>
    -
    +
    +
    + upgrade->start . $lang->upgrade->common);?> + +