diff --git a/module/task/lang/de.php b/module/task/lang/de.php index f8bbe39e34..89c69ec76d 100644 --- a/module/task/lang/de.php +++ b/module/task/lang/de.php @@ -220,7 +220,7 @@ $lang->task->error->deadlineSmall = '"Deadline" must be greater than "StartD $lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; $lang->task->error->realStartedEmpty = '"Real Started" should not be empty.'; $lang->task->error->finishedDateEmpty = '"Finished Date" should not be empty.'; -$lang->task->error->chooseOtherParent = 'the currently selected parent task has been consumed, please select another parent task.'; +$lang->task->error->alreadyConsumed = 'The currently selected parent task has been consumed.'; /* Report. */ $lang->task->report = new stdclass(); diff --git a/module/task/lang/en.php b/module/task/lang/en.php index bde600a865..e1940d7286 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -220,7 +220,7 @@ $lang->task->error->deadlineSmall = '"Deadline" must be greater than "StartD $lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; $lang->task->error->realStartedEmpty = '"Real Started" should not be empty.'; $lang->task->error->finishedDateEmpty = '"Finished Date" should not be empty.'; -$lang->task->error->chooseOtherParent = 'the currently selected parent task has been consumed, please select another parent task.'; +$lang->task->error->alreadyConsumed = 'The currently selected parent task has been consumed.'; /* Report. */ $lang->task->report = new stdclass(); diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php index 5ded91d617..d9e945f5c1 100644 --- a/module/task/lang/fr.php +++ b/module/task/lang/fr.php @@ -220,7 +220,7 @@ $lang->task->error->deadlineSmall = '"Date Limite" doit être supérieur à $lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; $lang->task->error->realStartedEmpty = '"Real Started" should not be empty.'; $lang->task->error->finishedDateEmpty = '"Finished Date" should not be empty.'; -$lang->task->error->chooseOtherParent = 'the currently selected parent task has been consumed, please select another parent task.'; +$lang->task->error->alreadyConsumed = 'The currently selected parent task has been consumed.'; /* Report. */ $lang->task->report = new stdclass(); diff --git a/module/task/lang/vi.php b/module/task/lang/vi.php index 43c9bd1926..156f85c110 100644 --- a/module/task/lang/vi.php +++ b/module/task/lang/vi.php @@ -220,7 +220,7 @@ $lang->task->error->deadlineSmall = '"Hạn chót" phải lớn hơn "Ngày $lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; $lang->task->error->realStartedEmpty = '"Real Started" should not be empty.'; $lang->task->error->finishedDateEmpty = '"Finished Date" should not be empty.'; -$lang->task->error->chooseOtherParent = 'the currently selected parent task has been consumed, please select another parent task.'; +$lang->task->error->alreadyConsumed = 'The currently selected parent task has been consumed.'; /* Report. */ $lang->task->report = new stdclass(); diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 5e9bda3dfb..489866a79c 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -220,7 +220,7 @@ $lang->task->error->deadlineSmall = '"截止日期"必须大于"预计开始 $lang->task->error->alreadyStarted = '此任务已被启动,不能重复启动!'; $lang->task->error->realStartedEmpty = '实际开始不能为空'; $lang->task->error->finishedDateEmpty = '实际完成不能为空'; -$lang->task->error->chooseOtherParent = '当前选中的父任务已有消耗,请选择其他父任务。'; +$lang->task->error->alreadyConsumed = '当前选中的父任务已有消耗。'; /* Report. */ $lang->task->report = new stdclass(); diff --git a/module/task/model.php b/module/task/model.php index fd3c5848cf..7d05276c2e 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -779,7 +779,7 @@ class taskModel extends model { $taskConsumed = 0; $taskConsumed = $this->dao->select('consumed')->from(TABLE_TASK)->where('id')->eq($this->post->parent)->andWhere('parent')->eq(0)->fetch('consumed'); - if($taskConsumed > 0) die(js::error($this->lang->task->error->chooseOtherParent)); + if($taskConsumed > 0) die(js::error($this->lang->task->error->alreadyConsumed)); } $now = helper::now();