diff --git a/module/action/lang/de.php b/module/action/lang/de.php index 9185653ea4..78bf7a4367 100644 --- a/module/action/lang/de.php +++ b/module/action/lang/de.php @@ -285,12 +285,13 @@ $lang->action->desc->unlinkrepobranch = '$date, $actor unli $lang->action->desc->changedprogram = '$date, $actor adjust the program $extra.' . "\n"; /* Used to describe the history of operations related to parent-child tasks. */ -$lang->action->desc->createchildren = '$date, $actor created a child task $extra。' . "\n"; -$lang->action->desc->linkchildtask = '$date, $actor linked a child task $extra。' . "\n"; -$lang->action->desc->unlinkchildrentask = '$date, $actor unlinked a child task $extra。' . "\n"; -$lang->action->desc->linkparenttask = '$date, $actor linked to a parent task $extra。' . "\n"; -$lang->action->desc->unlinkparenttask = '$date, $actor unlinked a parent task $extra。' . "\n"; -$lang->action->desc->deletechildrentask = '$date, $actor deleted a child task $extra。' . "\n"; +$lang->action->desc->createchildren = '$date, $actor created a child task $extra。' . "\n"; +$lang->action->desc->linkchildtask = '$date, $actor linked a child task $extra。' . "\n"; +$lang->action->desc->unlinkchildrentask = '$date, $actor unlinked a child task $extra。' . "\n"; +$lang->action->desc->linkparenttask = '$date, $actor linked to a parent task $extra。' . "\n"; +$lang->action->desc->unlinkparenttask = '$date, $actor unlinked a parent task $extra。' . "\n"; +$lang->action->desc->deletechildrentask = '$date, $actor deleted a child task $extra。' . "\n"; +$lang->action->desc->syncstorybyparenttask = "\$date, as the parent task updates its {$lang->SRCommon}, the child tasks are updated simultaneously.\n"; /* Used to describe the history of operations related to parent-child requirements. */ $lang->action->desc->createchildrenstory = '$date, $actor created a child story $extra。' . "\n"; diff --git a/module/action/lang/en.php b/module/action/lang/en.php index a4d21eb10e..7e40c47e7d 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -285,12 +285,13 @@ $lang->action->desc->unlinkrepobranch = '$date, $actor unli $lang->action->desc->changedprogram = '$date, $actor adjust the program $extra.' . "\n"; /* Used to describe the history of operations related to parent-child tasks. */ -$lang->action->desc->createchildren = '$date, $actor created a child task $extra。' . "\n"; -$lang->action->desc->linkchildtask = '$date, $actor linked a child task $extra。' . "\n"; -$lang->action->desc->unlinkchildrentask = '$date, $actor unlinked a child task $extra。' . "\n"; -$lang->action->desc->linkparenttask = '$date, $actor linked to a parent task $extra。' . "\n"; -$lang->action->desc->unlinkparenttask = '$date, $actor unlinked a parent task $extra。' . "\n"; -$lang->action->desc->deletechildrentask = '$date, $actor deleted a child task $extra。' . "\n"; +$lang->action->desc->createchildren = '$date, $actor created a child task $extra。' . "\n"; +$lang->action->desc->linkchildtask = '$date, $actor linked a child task $extra。' . "\n"; +$lang->action->desc->unlinkchildrentask = '$date, $actor unlinked a child task $extra。' . "\n"; +$lang->action->desc->linkparenttask = '$date, $actor linked to a parent task $extra。' . "\n"; +$lang->action->desc->unlinkparenttask = '$date, $actor unlinked a parent task $extra。' . "\n"; +$lang->action->desc->deletechildrentask = '$date, $actor deleted a child task $extra。' . "\n"; +$lang->action->desc->syncstorybyparenttask = "\$date, as the parent task updates its {$lang->SRCommon}, the child tasks are updated simultaneously.\n"; /* Used to describe the history of operations related to parent-child requirements. */ $lang->action->desc->createchildrenstory = '$date, $actor created a child story $extra。' . "\n"; diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php index 575feefa30..d7f4233584 100644 --- a/module/action/lang/fr.php +++ b/module/action/lang/fr.php @@ -285,12 +285,13 @@ $lang->action->desc->unlinkrepobranch = '$date, $actor unli $lang->action->desc->changedprogram = '$date, $actor adjust the program $extra.' . "\n"; /* Used to describe the history of operations related to parent-child tasks. */ -$lang->action->desc->createchildren = '$date, $actor a créé un sous-tâche $extra。' . "\n"; -$lang->action->desc->linkchildtask = '$date, $actor a raccroché une sous-tâche $extra。' . "\n"; -$lang->action->desc->unlinkchildrentask = '$date, $actor a décroché une sous-tâche $extra。' . "\n"; -$lang->action->desc->linkparenttask = '$date, $actor a accroché une tâche parent $extra。' . "\n"; -$lang->action->desc->unlinkparenttask = '$date, $actor a décroché une tâche parent $extra。' . "\n"; -$lang->action->desc->deletechildrentask = '$date, $actor a supprimé une sous-tâche $extra。' . "\n"; +$lang->action->desc->createchildren = '$date, $actor a créé un sous-tâche $extra。' . "\n"; +$lang->action->desc->linkchildtask = '$date, $actor a raccroché une sous-tâche $extra。' . "\n"; +$lang->action->desc->unlinkchildrentask = '$date, $actor a décroché une sous-tâche $extra。' . "\n"; +$lang->action->desc->linkparenttask = '$date, $actor a accroché une tâche parent $extra。' . "\n"; +$lang->action->desc->unlinkparenttask = '$date, $actor a décroché une tâche parent $extra。' . "\n"; +$lang->action->desc->deletechildrentask = '$date, $actor a supprimé une sous-tâche $extra。' . "\n"; +$lang->action->desc->syncstorybyparenttask = "\$date, as the parent task updates its {$lang->SRCommon}, the child tasks are updated simultaneously.\n"; /* Used to describe the history of operations related to parent-child requirements. */ $lang->action->desc->createchildrenstory = '$date, $actor a créé une sous-tory $extra。' . "\n"; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 2a904aa9a1..7029793c82 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -285,12 +285,13 @@ $lang->action->desc->unlinkrepobranch = '$date, 由 $actor $lang->action->desc->changedprogram = '$date, 由 $actor 调整了所属项目集。' . "\n"; /* 用来描述和父子任务相关的操作历史记录。*/ -$lang->action->desc->createchildren = '$date, 由 $actor 创建子任务 $extra。' . "\n"; -$lang->action->desc->linkchildtask = '$date, 由 $actor 关联子任务 $extra。' . "\n"; -$lang->action->desc->unlinkchildrentask = '$date, 由 $actor 移除子任务 $extra。' . "\n"; -$lang->action->desc->linkparenttask = '$date, 由 $actor 关联到父任务 $extra。' . "\n"; -$lang->action->desc->unlinkparenttask = '$date, 由 $actor 从父任务$extra取消关联。' . "\n"; -$lang->action->desc->deletechildrentask = '$date, 由 $actor 删除子任务$extra。' . "\n"; +$lang->action->desc->createchildren = '$date, 由 $actor 创建子任务 $extra。' . "\n"; +$lang->action->desc->linkchildtask = '$date, 由 $actor 关联子任务 $extra。' . "\n"; +$lang->action->desc->unlinkchildrentask = '$date, 由 $actor 移除子任务 $extra。' . "\n"; +$lang->action->desc->linkparenttask = '$date, 由 $actor 关联到父任务 $extra。' . "\n"; +$lang->action->desc->unlinkparenttask = '$date, 由 $actor 从父任务$extra取消关联。' . "\n"; +$lang->action->desc->deletechildrentask = '$date, 由 $actor 删除子任务$extra。' . "\n"; +$lang->action->desc->syncstorybyparenttask = "\$date, 由于父任务更新了相关需求，子任务同步更新。\n"; /* 用来描述和父子需求相关的操作历史记录。*/ $lang->action->desc->createchildrenstory = '$date, 由 $actor 创建子需求 $extra。' . "\n"; diff --git a/module/task/config/form.php b/module/task/config/form.php index 00264029c1..fb605fd49a 100644 --- a/module/task/config/form.php +++ b/module/task/config/form.php @@ -95,6 +95,7 @@ $config->task->form->team->edit = $config->task->form->team->create; $config->task->form->batchedit = array(); $config->task->form->batchedit['id'] = array('type' => 'int', 'required' => false, 'default' => 0, 'base' => true); $config->task->form->batchedit['module'] = array('type' => 'int', 'required' => false, 'default' => 0); +$config->task->form->batchedit['story'] = array('type' => 'int', 'required' => false, 'default' => 0); $config->task->form->batchedit['name'] = array('type' => 'string', 'required' => true, 'default' => ''); $config->task->form->batchedit['color'] = array('type' => 'string', 'required' => false, 'default' => ''); $config->task->form->batchedit['type'] = array('type' => 'string', 'required' => true, 'default' => ''); diff --git a/module/task/lang/de.php b/module/task/lang/de.php index 79d0a41295..75d521212a 100644 --- a/module/task/lang/de.php +++ b/module/task/lang/de.php @@ -286,6 +286,8 @@ $lang->task->cannotDeleteParent = 'Cannot delete parent task'; $lang->task->addChildTask = 'Because the task has already consumed consumption, to ensure data consistency, we will help you create a subtask with the same name to record the consumption.'; $lang->task->selectTestStoryTip = "The following {$lang->SRCommon} will be subtasks of this task"; $lang->task->effortOperateTips = 'Only the project manager, the executive supervisor, and the department head have the authority to %s logs belonging to others.'; +$lang->task->syncStoryToAllChildrenTip = "Will be {$lang->SRCommon} synchronised with all child tasks?"; +$lang->task->syncStoryToChildrenTip = "Child tasks of %s do not have {$lang->SRCommon}, will {$lang->SRCommon} be synchronised with these child tasks?"; $lang->task->error = new stdclass(); $lang->task->error->totalNumber = '"Total Cost" must be numbers.'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 08ab8b51e4..6c42da8dbd 100755 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -286,6 +286,8 @@ $lang->task->cannotDeleteParent = 'Cannot delete parent task'; $lang->task->addChildTask = 'Because the task has cost hours, ZenTao will create a child task with the same name to record the cost housrs to ensure data consistency.'; $lang->task->selectTestStoryTip = "The following {$lang->SRCommon} will be subtasks of this task"; $lang->task->effortOperateTips = 'Only the project manager, the executive supervisor, and the department head have the authority to %s logs belonging to others.'; +$lang->task->syncStoryToAllChildrenTip = "Will be {$lang->SRCommon} synchronised with all child tasks?"; +$lang->task->syncStoryToChildrenTip = "Child tasks of %s do not have {$lang->SRCommon}, will {$lang->SRCommon} be synchronised with these child tasks?"; $lang->task->error = new stdclass(); $lang->task->error->totalNumber = '"Total Cost" must be numbers.'; diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php index 77a4a04900..3b98ab15c7 100644 --- a/module/task/lang/fr.php +++ b/module/task/lang/fr.php @@ -286,6 +286,8 @@ $lang->task->cannotDeleteParent = 'Impossible de supprimer la tâche pare $lang->task->addChildTask = 'Because the task has already consumed consumption, to ensure data consistency, we will help you create a subtask with the same name to record the consumption.'; $lang->task->selectTestStoryTip = "The following {$lang->SRCommon} will be subtasks of this task"; $lang->task->effortOperateTips = 'Only the project manager, the executive supervisor, and the department head have the authority to %s logs belonging to others.'; +$lang->task->syncStoryToAllChildrenTip = "Will be {$lang->SRCommon} synchronised with all child tasks?"; +$lang->task->syncStoryToChildrenTip = "Child tasks of %s do not have {$lang->SRCommon}, will {$lang->SRCommon} be synchronised with these child tasks?"; $lang->task->error = new stdclass(); $lang->task->error->totalNumber = '"Coût Total" doit être numérique.'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 542ab9a960..228e2afa1c 100755 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -286,6 +286,8 @@ $lang->task->cannotDeleteParent = '不能删除父任务。'; $lang->task->addChildTask = '因该任务已经产生消耗，为保证数据一致性，我们会帮您创建一条同名子任务记录该消耗。'; $lang->task->selectTestStoryTip = "以下{$lang->SRCommon}将作为此任务的子任务"; $lang->task->effortOperateTips = '只有项目负责人、执行负责人、所属部门负责人才能%s他人日志。'; +$lang->task->syncStoryToAllChildrenTip = "是否同步更新所有子任务的相关{$lang->SRCommon}？"; +$lang->task->syncStoryToChildrenTip = "子任务%s没有关联{$lang->SRCommon}，是否同步更新这些子任务的相关{$lang->SRCommon}？"; $lang->task->error = new stdclass(); $lang->task->error->totalNumber = '"耗时"必须为数字';