diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 9cd8aa1b8c..d6c506033d 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -140,6 +140,7 @@ $lang->execution->myTask = "My Task"; $lang->execution->list = "{$lang->executionCommon} List"; $lang->execution->allProject = 'All'; $lang->execution->method = 'Method'; +$lang->execution->sameAsParent = "Same as parent"; /* Fields of zt_team. */ $lang->execution->root = 'Root'; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 5331ed2369..995e4f9d53 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -140,6 +140,7 @@ $lang->execution->myTask = "My Task"; $lang->execution->list = 'List'; $lang->execution->allProject = 'All'; $lang->execution->method = 'Method'; +$lang->execution->sameAsParent = "Same as parent"; /* Fields of zt_team. */ $lang->execution->root = 'Root'; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index 41520d6e0d..ac5351d360 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -140,6 +140,7 @@ $lang->execution->myTask = "My Task"; $lang->execution->list = "{$lang->executionCommon} List"; $lang->execution->allProject = 'Tous'; $lang->execution->method = 'Method'; +$lang->execution->sameAsParent = "Same as parent"; /* Fields of zt_team. */ $lang->execution->root = 'Root'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index bfb7610028..a83b65dc25 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -140,6 +140,7 @@ $lang->execution->myTask = "我的任务"; $lang->execution->list = '列表'; $lang->execution->allProject = '全部项目'; $lang->execution->method = '方法'; +$lang->execution->sameAsParent = "同父阶段"; /* Fields of zt_team. */ $lang->execution->root = '源ID'; diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php index 7b1a58d0cf..5068fce91a 100644 --- a/module/programplan/lang/de.php +++ b/module/programplan/lang/de.php @@ -110,7 +110,7 @@ $lang->programplan->ganttCustom['delayDays'] = 'Delay days'; $lang->programplan->error = new stdclass(); $lang->programplan->error->percentNumber = '"Workload %" must be digits.'; $lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begin" date.'; -$lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100%.'; +$lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100% of one stage.'; $lang->programplan->error->createdTask = 'The task has been decomposed. Sub phases cannot be added.'; $lang->programplan->error->parentWorkload = 'The sum of the workload of the child phase cannot be greater than that of the parent phase: %s.'; $lang->programplan->error->parentDuration = 'The planned start and planned completion of the child phase cannot exceed the parent phase.'; @@ -119,6 +119,7 @@ $lang->programplan->error->sameCode = 'Stage code cannot be the same!'; $lang->programplan->error->taskDrag = 'The %s task cannot be dragged'; $lang->programplan->error->planDrag = 'The %s stage cannot be dragged'; $lang->programplan->error->notStage = $lang->executionCommon . '/Kanban cannot create a sub stage.'; +$lang->programplan->error->sameType = 'Type of the stage must be as same as parent: "%s"'; $lang->programplan->ganttBrowseType['gantt'] = 'Group by Stage'; $lang->programplan->ganttBrowseType['assignedTo'] = 'Group by AssignedTo'; diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php index 6d25da9d4c..689cfeb296 100644 --- a/module/programplan/lang/en.php +++ b/module/programplan/lang/en.php @@ -110,7 +110,7 @@ $lang->programplan->ganttCustom['delayDays'] = 'Delay days'; $lang->programplan->error = new stdclass(); $lang->programplan->error->percentNumber = '"Workload %" must be digits.'; $lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begin" date.'; -$lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100%.'; +$lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100% of one stage.'; $lang->programplan->error->createdTask = 'The task is decomposed. Sub stages cannot be added.'; $lang->programplan->error->parentWorkload = 'The sum of the workload in the sub stage cannot be > that in the parent stage: %s.'; $lang->programplan->error->parentDuration = 'The planned start and planned completion of the child phase cannot exceed the parent phase.'; @@ -119,6 +119,7 @@ $lang->programplan->error->sameCode = 'Stage code cannot be the same!'; $lang->programplan->error->taskDrag = 'The %s task cannot be dragged'; $lang->programplan->error->planDrag = 'The %s stage cannot be dragged'; $lang->programplan->error->notStage = $lang->executionCommon . '/Kanban cannot create a sub stage.'; +$lang->programplan->error->sameType = 'Type of the stage must be as same as parent: "%s"'; $lang->programplan->ganttBrowseType['gantt'] = 'Group by Stage'; $lang->programplan->ganttBrowseType['assignedTo'] = 'Group by AssignedTo'; diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php index 7b1a58d0cf..5068fce91a 100644 --- a/module/programplan/lang/fr.php +++ b/module/programplan/lang/fr.php @@ -110,7 +110,7 @@ $lang->programplan->ganttCustom['delayDays'] = 'Delay days'; $lang->programplan->error = new stdclass(); $lang->programplan->error->percentNumber = '"Workload %" must be digits.'; $lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begin" date.'; -$lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100%.'; +$lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100% of one stage.'; $lang->programplan->error->createdTask = 'The task has been decomposed. Sub phases cannot be added.'; $lang->programplan->error->parentWorkload = 'The sum of the workload of the child phase cannot be greater than that of the parent phase: %s.'; $lang->programplan->error->parentDuration = 'The planned start and planned completion of the child phase cannot exceed the parent phase.'; @@ -119,6 +119,7 @@ $lang->programplan->error->sameCode = 'Stage code cannot be the same!'; $lang->programplan->error->taskDrag = 'The %s task cannot be dragged'; $lang->programplan->error->planDrag = 'The %s stage cannot be dragged'; $lang->programplan->error->notStage = $lang->executionCommon . '/Kanban cannot create a sub stage.'; +$lang->programplan->error->sameType = 'Type of the stage must be as same as parent: "%s"'; $lang->programplan->ganttBrowseType['gantt'] = 'Group by Stage'; $lang->programplan->ganttBrowseType['assignedTo'] = 'Group by AssignedTo'; diff --git a/module/programplan/lang/vi.php b/module/programplan/lang/vi.php index da516686a2..0a5cb7e8cb 100644 --- a/module/programplan/lang/vi.php +++ b/module/programplan/lang/vi.php @@ -68,6 +68,7 @@ $lang->programplan->stageCustom->task = 'Show Task'; $lang->programplan->error = new stdclass(); $lang->programplan->error->percentNumber = '"Workload %" must be digits.'; $lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begin" date.'; -$lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100%.'; +$lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100% of one stage.'; $lang->programplan->error->createdTask = 'The task has been decomposed. Sub phases cannot be added.'; $lang->programplan->error->parentWorkload = 'The sum of the workload of the child phase cannot be greater than that of the parent phase: %s.'; +$lang->programplan->error->sameType = 'Type of the stage must be as same as parent: "%s"'; diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php index eb55d08810..fcf4a5d0d6 100644 --- a/module/programplan/lang/zh-cn.php +++ b/module/programplan/lang/zh-cn.php @@ -110,7 +110,7 @@ $lang->programplan->ganttCustom['delayDays'] = '延期天数'; $lang->programplan->error = new stdclass(); $lang->programplan->error->percentNumber = '"工作量占比"必须为数字'; $lang->programplan->error->planFinishSmall = '"计划完成时间"必须大于"计划开始时间"'; -$lang->programplan->error->percentOver = '工作量占比累计不应当超过100%'; +$lang->programplan->error->percentOver = '相同父阶段的子阶段工作量占比之和不超过100%'; $lang->programplan->error->createdTask = '已分解任务,不可添加子阶段'; $lang->programplan->error->parentWorkload = '子阶段的工作量之和不能大于父阶段的工作量:%s'; $lang->programplan->error->parentDuration = '子阶段计划开始、计划完成不能超过父阶段'; @@ -119,6 +119,7 @@ $lang->programplan->error->sameCode = '阶段代号不能相同!'; $lang->programplan->error->taskDrag = '%s的任务不可以拖动'; $lang->programplan->error->planDrag = '%s的阶段不可以拖动'; $lang->programplan->error->notStage = $lang->executionCommon . '/看板不支持创建子阶段'; +$lang->programplan->error->sameType = '父阶段类型为"%s",阶段类型需与父阶段一致'; $lang->programplan->ganttBrowseType['gantt'] = '按阶段分组'; $lang->programplan->ganttBrowseType['assignedTo'] = '按指派给分组'; diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 5fa5aff2a4..7f94f5af3d 100755 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -54,7 +54,6 @@ -