diff --git a/module/gitlab/config.php b/module/gitlab/config.php index a7564b7ee3..5f41d70ceb 100644 --- a/module/gitlab/config.php +++ b/module/gitlab/config.php @@ -65,7 +65,7 @@ $config->gitlab->taskWeightMap['1'] = '1'; $config->gitlab->taskWeightMap['2'] = '2'; $config->gitlab->taskWeightMap['3'] = '3'; -$config->gitlab->taskStateMap = array(); +$config->gitlab->taskStateMap = array(); $config->gitlab->taskStateMap['doing'] = 'opened'; $config->gitlab->taskStateMap['wait'] = 'opened'; $config->gitlab->taskStateMap['closed'] = 'closed'; @@ -100,9 +100,8 @@ $config->gitlab->objectTables->story = TABLE_STORY; $config->gitlab->objectTables->task = TABLE_TASK; $config->gitlab->objectTables->bug = TABLE_BUG; -$config->gitlab->objectTypes = array(); -$config->gitlab->objectTypes[''] = ''; -$config->gitlab->objectTypes['task'] = '任务'; -$config->gitlab->objectTypes['bug'] = 'Bug'; -$config->gitlab->objectTypes['story'] = '需求'; - +$config->gitlab->objectTypes = array(); +$config->gitlab->objectTypes[''] = ''; +$config->gitlab->objectTypes['task'] = '任务'; +$config->gitlab->objectTypes['bug'] = 'Bug'; +$config->gitlab->objectTypes['story'] = '需求'; diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php index c1d4f9a784..7da95d681a 100644 --- a/module/gitlab/lang/en.php +++ b/module/gitlab/lang/en.php @@ -15,13 +15,13 @@ $lang->gitlab->zentaoAccount = 'Zentao Account'; $lang->gitlab->browseAction = 'GitLab List'; $lang->gitlab->deleteAction = 'Delete GitLab'; -$lang->gitlab->gitlabProject = "{$lang->gitlab->common} project"; -$lang->gitlab->gitlabIssue = "{$lang->gitlab->common} issue"; +$lang->gitlab->gitlabProject = "GitLab Project"; +$lang->gitlab->gitlabIssue = "GitLab Issue"; $lang->gitlab->zentaoProduct = 'Zentao Product'; $lang->gitlab->objectType = 'Type'; // task, bug, story $lang->gitlab->id = 'ID'; -$lang->gitlab->name = "{$lang->gitlab->common} Name"; +$lang->gitlab->name = "GitLab Name"; $lang->gitlab->url = 'GitLab URL'; $lang->gitlab->token = 'Token'; $lang->gitlab->defaultProject = 'Default Project'; @@ -43,4 +43,3 @@ $lang->gitlab->hostError = "Invalid GitLab service address."; $lang->gitlab->bindUserError = "Can not bind users repeatedly %s"; $lang->gitlab->importIssueError = "The execution to which this issue belongs is not selected."; $lang->gitlab->importIssueWarn = "There is a problem of import failure, you can try to import again."; - diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index ea5df297f8..6babb7617a 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -16,7 +16,7 @@ $lang->gitlab->zentaoAccount = '禅道用户'; $lang->gitlab->browseAction = 'GitLab列表'; $lang->gitlab->deleteAction = '删除GitLab'; $lang->gitlab->gitlabProject = "{$lang->gitlab->common}项目"; -$lang->gitlab->gitlabIssue = "{$lang->gitlab->common}issue"; +$lang->gitlab->gitlabIssue = "{$lang->gitlab->common} issue"; $lang->gitlab->zentaoProduct = '禅道产品'; $lang->gitlab->objectType = '类型'; // task, bug, story diff --git a/module/gitlab/view/binduser.html.php b/module/gitlab/view/binduser.html.php index e634429c64..fec3c08652 100644 --- a/module/gitlab/view/binduser.html.php +++ b/module/gitlab/view/binduser.html.php @@ -28,10 +28,11 @@ zentaoAccount)) continue;?>
ZenTao version 15.0 has major upgrade of features, including:
+1. Add the concept of Program
+A program is a collection of interrelated and coordinated projects. It is at the highest level and belongs to the concept of a strategic level. It has multi-level project management, helping managers to form strategic directions and allocate resources at a macro level.
+2. Clarify the concept of Product and Project
+Product defines what should be done and focuses on requirement management. Project defines how to do it and focuses on finishing tasks of the project within the specified time, budget and quality objectives. A project can be done in Agile or Waterfall, which is the management of the campaign level.
3. Add the concept of Project Model
+The new version 15.0 adds a Waterfall model (available in ZenTao Max) to help the project team choose the right project management method according to their needs. Kanban model will be coming soon.
4. Add the concept of Execution
+In Version 15.0, depending on the management model, a project can have multiple iterations/sprints/ phases which are Executions in ZenTao. Through executions, the project tasks are completed and the final outcome is delivered.
5. Adjust the Navigation
+The top level navigation is moved to the left, and multi-application switching is added as new UI/UX.
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?
+You can try the online demo before you decide to enable new features: New Features Online Demo
+You can also download an introduction PPT to help you understand it: New Features Introduction PPT
+ +ZenTao Version 15.0 Introduction
+How do you like to use ZenTao?
EOD; $lang->upgrade->to15Mode['classic'] = 'Keep the old version'; @@ -101,7 +106,7 @@ $lang->upgrade->mergeProgramDesc = <<ZenTao version 15.0 has major upgrade of features, including:
+1. Add the concept of Program
+A program is a collection of interrelated and coordinated projects. It is at the highest level and belongs to the concept of a strategic level. It has multi-level project management, helping managers to form strategic directions and allocate resources at a macro level.
+2. Clarify the concept of Product and Project
+Product defines what should be done and focuses on requirement management. Project defines how to do it and focuses on finishing tasks of the project within the specified time, budget and quality objectives. A project can be done in Agile or Waterfall, which is the management of the campaign level.
3. Add the concept of Project Model
+The new version 15.0 adds a Waterfall model (available in ZenTao Max) to help the project team choose the right project management method according to their needs. Kanban model will be coming soon.
4. Add the concept of Execution
+In Version 15.0, depending on the management model, a project can have multiple iterations/sprints/ phases which are Executions in ZenTao. Through executions, the project tasks are completed and the final outcome is delivered.
5. Adjust the Navigation
+The top level navigation is moved to the left, and multi-application switching is added as new UI/UX.
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?
+You can try the online demo before you decide to enable new features: New Features Online Demo
+You can also download an introduction PPT to help you understand it: New Features Introduction PPT
+ +ZenTao Version 15.0 Introduction
+How do you like to use ZenTao?
EOD; $lang->upgrade->mergeProgramDesc = <<ZenTao version 15.0 has major upgrade of features, including:
+1. Add the concept of Program
+A program is a collection of interrelated and coordinated projects. It is at the highest level and belongs to the concept of a strategic level. It has multi-level project management, helping managers to form strategic directions and allocate resources at a macro level.
+2. Clarify the concept of Product and Project
+Product defines what should be done and focuses on requirement management. Project defines how to do it and focuses on finishing tasks of the project within the specified time, budget and quality objectives. A project can be done in Agile or Waterfall, which is the management of the campaign level.
3. Add the concept of Project Model
+The new version 15.0 adds a Waterfall model (available in ZenTao Max) to help the project team choose the right project management method according to their needs. Kanban model will be coming soon.
4. Add the concept of Execution
+In Version 15.0, depending on the management model, a project can have multiple iterations/sprints/ phases which are Executions in ZenTao. Through executions, the project tasks are completed and the final outcome is delivered.
5. Adjust the Navigation
+The top level navigation is moved to the left, and multi-application switching is added as new UI/UX.
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?
+You can try the online demo before you decide to enable new features: New Features Online Demo
+You can also download an introduction PPT to help you understand it: New Features Introduction PPT
+ +ZenTao Version 15.0 Introduction
+How do you like to use ZenTao?
EOD; $lang->upgrade->to15Mode['classic'] = 'Keep the old version'; @@ -102,7 +107,7 @@ $lang->upgrade->mergeProgramDesc = <<ZenTao version 15.0 has major upgrade of features, including:
+1. Add the concept of Program
+A program is a collection of interrelated and coordinated projects. It is at the highest level and belongs to the concept of a strategic level. It has multi-level project management, helping managers to form strategic directions and allocate resources at a macro level.
+2. Clarify the concept of Product and Project
+Product defines what should be done and focuses on requirement management. Project defines how to do it and focuses on finishing tasks of the project within the specified time, budget and quality objectives. A project can be done in Agile or Waterfall, which is the management of the campaign level.
3. Add the concept of Project Model
+The new version 15.0 adds a Waterfall model (available in ZenTao Max) to help the project team choose the right project management method according to their needs. Kanban model will be coming soon.
4. Add the concept of Execution
+In Version 15.0, depending on the management model, a project can have multiple iterations/sprints/ phases which are Executions in ZenTao. Through executions, the project tasks are completed and the final outcome is delivered.
5. Adjust the Navigation
+The top level navigation is moved to the left, and multi-application switching is added as new UI/UX.
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?
+You can try the online demo before you decide to enable new features: New Features Online Demo
+You can also download an introduction PPT to help you understand it: New Features Introduction PPT
+ +ZenTao Version 15.0 Introduction
+How do you like to use ZenTao?
EOD; $lang->upgrade->to15Mode['classic'] = 'Keep the old version'; @@ -102,7 +107,7 @@ $lang->upgrade->mergeProgramDesc = <<尊敬的用户,禅道从15版本开始系统功能做了重大升级,主要改动如下:
+一、增加了项目集概念
+项目集是一组相互关联,且被协调管理的项目集合,处于最高层级,属于战略层面的概念。它可以进行多层级管理,帮助管理者站在宏观的视角去制定战略方向和分配资源。
+二、明确了产品和项目概念
+产品是定义做什么,主要管理需求;项目是定义如何做,主要是在规定的时间、预算和质量目标范围内完成项目的各种工作,可以通过敏捷迭代的方式,也可以通过瀑布阶段的方式,属于战役层面的管理。
+三、增加了项目模型概念
+新版本在敏捷管理模型的基础上增加了瀑布管理模型(旗舰版提供),后续还会支持看板管理模型,帮助项目团队按需选择适合的项目管理方式。
+四、增加了执行概念
+新版本中,根据选择管理模型的不同,一个项目可以包含多个迭代/冲刺或阶段,我们把多个迭代/冲刺或阶段统称为执行,通过执行去完成项目的任务,交付最终的结果。
+五、调整了导航结构
+将一级导航调整到了界面左侧,同时增加了多应用切换的全新交互体验。
+您可以在线体验最新版本的功能,以决定是否启用新的模式:最新版演示demo
+您还可以下载新版本功能介绍PPT:最新版功能介绍PPT
+ +禅道15.0版本介绍
您可以在线体验最新版本的功能,以决定是否启用的模式:演示demo
-请问您计划如何使用禅道的新版本呢?
EOD; @@ -89,7 +97,7 @@ $lang->upgrade->selectedModeTips['classic'] = '后续您还可以在后台-自 $lang->upgrade->selectedModeTips['new'] = '切换为项目集管理模式需要对之前的数据进行归并处理,系统会引导您完成这个操作。'; $lang->upgrade->line = '产品线'; -$lang->upgrade->allLines = '所有产品线'; +$lang->upgrade->allLines = "所有{$lang->productCommon}线"; $lang->upgrade->program = '目标项目集和项目'; $lang->upgrade->existProgram = '已有项目集'; $lang->upgrade->existProject = '已有项目'; diff --git a/module/upgrade/view/to15guide.html.php b/module/upgrade/view/to15guide.html.php index a3ca30534b..54a38160b4 100644 --- a/module/upgrade/view/to15guide.html.php +++ b/module/upgrade/view/to15guide.html.php @@ -35,7 +35,7 @@ ?>