Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'revert-db968165' into 'master'

Browse Source 
Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'"

See merge request easycorp/zentaopms!1331
This commit is contained in:
王怡栋
2022-01-11 00:40:34 +00:00
parent 3ab13aa61e 1cae18380b
commit 1e50b1b3e4
3 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/lang/en.php
+2 -5
View File
@@ -155,7 +155,6 @@ $lang->project->etc = " , etc";
$lang->project->product = 'Product';
$lang->project->branch = 'Branch';
$lang->project->plan = 'Plan';
$lang->project->kanban = 'Kanban';
/* Project Kanban. */
$lang->project->typeList = array();
@@ -254,10 +253,6 @@ $lang->project->endList[186] = 'Half yearly';
$lang->project->endList[365] = 'One year';
$lang->project->endList[999] = 'Longtime';
$lang->project->scrumTitle = 'Agile Development Management';
$lang->project->waterfallTitle = 'Waterfall Project Management';
$lang->project->kanbanTitle = 'Kanban Project Management';
$lang->project->empty = 'No project.';
$lang->project->nextStep = 'Next step';
$lang->project->hoursUnit = '%s hours';
@@ -266,6 +261,7 @@ $lang->project->lastIteration = "Recent {$lang->executionCommon}";
$lang->project->ongoingStage = 'Ongoing stage';
$lang->project->scrum = 'Scrum';
$lang->project->waterfall = 'Waterfall';
$lang->project->waterfallTitle = 'Waterfall Project Management';
$lang->project->cannotCreateChild = 'It is not empty, so you cannot add a child. You can add a parent for it, and then create a child.';
$lang->project->confirmDelete = "Do you want to delete [%s]?";
$lang->project->emptyPM = 'No manager';
@@ -283,6 +279,7 @@ $lang->project->programTitle['end'] = 'End-level project only';
$lang->project->accessDenied = 'Access denied to this project';
$lang->project->chooseProgramType = 'Select management type';
$lang->project->scrumTitle = 'Agile Development Management';
$lang->project->cannotCreateChild = 'The project has contents, so you cannot add a child project. You can create a parent project for this one and then add a child project for the parent project.';
$lang->project->hasChildren = 'This project has a child project, so it cannot be deleted.';
$lang->project->confirmDelete = 'Do you want to delete this project?';
module/project/lang/zh-cn.php
+2 -5
View File
@@ -155,7 +155,6 @@ $lang->project->etc = "等";
$lang->project->product = '所属产品';
$lang->project->branch = '所属分支';
$lang->project->plan = '所属计划';
$lang->project->kanban = '看板';
/* Project Kanban. */
$lang->project->typeList = array();
@@ -254,10 +253,6 @@ $lang->project->endList[186] = '半年';
$lang->project->endList[365] = '一年';
$lang->project->endList[999] = '长期';
$lang->project->scrumTitle = '敏捷开发全流程项目管理';
$lang->project->waterfallTitle = '瀑布式项目管理';
$lang->project->kanbanTitle = '专业研发看板项目管理';
$lang->project->empty = '暂时没有项目';
$lang->project->nextStep = '下一步';
$lang->project->hoursUnit = '%s 工时';
@@ -266,6 +261,7 @@ $lang->project->lastIteration = "近期{$lang->executionCommon}";
$lang->project->ongoingStage = '进行中的阶段';
$lang->project->scrum = 'Scrum';
$lang->project->waterfall = '瀑布';
$lang->project->waterfallTitle = '瀑布式项目管理';
$lang->project->cannotCreateChild = '该项目已经有实际的内容，无法直接添加子项目。您可以为当前项目创建一个父项目，然后在新的父项目下面添加子项目。';
$lang->project->confirmDelete = "您确定要删除吗？";
$lang->project->emptyPM = '暂无';
@@ -283,6 +279,7 @@ $lang->project->programTitle['end'] = '只显示最后一级项目集';
$lang->project->accessDenied = '您无权访问该项目！';
$lang->project->chooseProgramType = '选择项目管理方式';
$lang->project->scrumTitle = '敏捷开发全流程项目管理';
$lang->project->cannotCreateChild = '该项目已经有实际的内容，无法直接添加子项目。您可以为当前项目创建一个父项目，然后在新的父项目下面添加子项目。';
$lang->project->hasChildren = '该项目有子项目存在，不能删除。';
$lang->project->confirmDelete = "您确定删除项目[%s]吗？";
module/project/view/createguide.html.php
+2 -9
View File
@@ -15,27 +15,20 @@
<button class="close" data-dismiss="modal">x</button>
<h2 class='text-center'><?php echo $lang->project->chooseProgramType; ?></h2>
<div class='row'>
<div class='col-xs-4'>
<div class='col-xs-6'>
<div class='project-type text-center'>
<?php echo html::a($this->createLink("project", "create", "model=scrum&programID=$programID&copyProjectID=0&extra=productID=$productID,branchID=$branchID"), "<img class='project-type-img' data-type='scrum' src='{$config->webRoot}theme/default/images/main/scrum.png'>", '', "data-app='project' class='createButton'")?>
<h3><?php echo $lang->project->scrum; ?></h3>
<p><?php echo $lang->project->scrumTitle; ?></p>
</div>
</div>
<div class='col-xs-4'>
<div class='col-xs-6'>
<div class='project-type text-center'>
<?php echo html::a($this->createLink("project", "create", "model=waterfall&programID=$programID&copyProjectID=0&extra=productID=$productID,branchID=$branchID"), "<img class='project-type-img' data-type='waterfall' src='{$config->webRoot}theme/default/images/main/waterfall.png'>", '', "data-app='project' class='createButton'")?>
<h3><?php echo $lang->project->waterfall; ?></h3>
<p><?php echo $lang->project->waterfallTitle; ?></p>
</div>
</div>
<div class='col-xs-4'>
<div class='project-type text-center'>
<?php echo html::a($this->createLink("project", "create", "model=kanban&programID=$programID&copyProjectID=0&extra=productID=$productID,branchID=$branchID"), "<img class='project-type-img' data-type='kanban' src='{$config->webRoot}theme/default/images/main/kanban.png'>", '', "data-app='project' class='createButton'")?>
<h3><?php echo $lang->project->kanban;?></h3>
<p><?php echo $lang->project->kanbanTitle;?></p>
</div>
</div>
</div>
</div>
</div>