diff --git a/module/task/lang/de.php b/module/task/lang/de.php index 0951ddd38c..bddff00969 100644 --- a/module/task/lang/de.php +++ b/module/task/lang/de.php @@ -200,22 +200,22 @@ $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->error = new stdclass(); -$lang->task->error->totalNumber = '"Total Cost" must be numbers.'; -$lang->task->error->consumedNumber = '"Verbraucht" muss eine Zahl sein.'; -$lang->task->error->estimateNumber = '"Stunden" müss eine Zahl sein.'; -$lang->task->error->leftNumber = '"Left" must be numbers.'; -$lang->task->error->recordMinus = 'Work hours should not be negative number.'; -$lang->task->error->consumedSmall = '"Genutzt" muss larger than before.'; -$lang->task->error->consumedThisTime = 'Bitte geben Sie die Stunden an'; -$lang->task->error->left = 'Bitte geben Sie die verbleibenden Stunden an"'; -$lang->task->error->work = '"Bemerkung" muss kleiner als %d Zeichen sein.'; -$lang->task->error->skipClose = 'Aufgabe: %s ist nicht “Erledigt” oder “Abgebrochen”. Möchten Sie die Aufgabe jetzt schließen?'; -$lang->task->error->consumed = 'Aufgabe: %s Hour must be more than 0. Ignore changes to this Task.'; -$lang->task->error->assignedTo = 'Mehere Tasks können nicht zugewisen werden, da die Benutzer nicht teil des Teams sind.'; -$lang->task->error->consumedEmpty = '"Current Cost" should not be 0.'; -$lang->task->error->deadlineSmall = '"Deadline" must be greater than "StartDate".'; -$lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; -$lang->task->error->chooseOtherParent = 'the currently selected parent task has been consumed, please select another parent task.'; +$lang->task->error->totalNumber = '"Total Cost" must be numbers.'; +$lang->task->error->consumedNumber = '"Verbraucht" muss eine Zahl sein.'; +$lang->task->error->estimateNumber = '"Stunden" müss eine Zahl sein.'; +$lang->task->error->leftNumber = '"Left" must be numbers.'; +$lang->task->error->recordMinus = 'Work hours should not be negative number.'; +$lang->task->error->consumedSmall = '"Genutzt" muss larger than before.'; +$lang->task->error->consumedThisTime = 'Bitte geben Sie die Stunden an'; +$lang->task->error->left = 'Bitte geben Sie die verbleibenden Stunden an"'; +$lang->task->error->work = '"Bemerkung" muss kleiner als %d Zeichen sein.'; +$lang->task->error->skipClose = 'Aufgabe: %s ist nicht “Erledigt” oder “Abgebrochen”. Möchten Sie die Aufgabe jetzt schließen?'; +$lang->task->error->consumed = 'Aufgabe: %s Hour must be more than 0. Ignore changes to this Task.'; +$lang->task->error->assignedTo = 'Mehere Tasks können nicht zugewisen werden, da die Benutzer nicht teil des Teams sind.'; +$lang->task->error->consumedEmpty = '"Current Cost" should not be 0.'; +$lang->task->error->deadlineSmall = '"Deadline" must be greater than "StartDate".'; +$lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; +$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 4078d1df12..e732aaced8 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -200,22 +200,22 @@ $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->error = new stdclass(); -$lang->task->error->totalNumber = '"Total Cost" must be numbers.'; -$lang->task->error->consumedNumber = '"Current Cost" must be numbers.'; -$lang->task->error->estimateNumber = '"Estimates" must be numbers.'; -$lang->task->error->leftNumber = '"Left" must be numbers.'; -$lang->task->error->recordMinus = 'Work hours should not be negative number.'; -$lang->task->error->consumedSmall = '"Total Cost" must be > the last number.'; -$lang->task->error->consumedThisTime = 'Please enter "Hours Cost"'; -$lang->task->error->left = 'Please enter "Hours Left"'; -$lang->task->error->work = '"Comment" must be < %d characters.'; -$lang->task->error->skipClose = 'Task: %s is not "Finished” or “Cancelled”. Do you want to close it?'; -$lang->task->error->consumed = 'Task: %s hour must be < 0. Ignore changes to this task.'; -$lang->task->error->assignedTo = 'Multi-user task in the current status cannot be assigned to a member who is not in the task team.'; -$lang->task->error->consumedEmpty = '"Current Cost" should not be 0.'; -$lang->task->error->deadlineSmall = '"Deadline" must be greater than "StartDate".'; -$lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; -$lang->task->error->chooseOtherParent = 'the currently selected parent task has been consumed, please select another parent task.'; +$lang->task->error->totalNumber = '"Total Cost" must be numbers.'; +$lang->task->error->consumedNumber = '"Current Cost" must be numbers.'; +$lang->task->error->estimateNumber = '"Estimates" must be numbers.'; +$lang->task->error->leftNumber = '"Left" must be numbers.'; +$lang->task->error->recordMinus = 'Work hours should not be negative number.'; +$lang->task->error->consumedSmall = '"Total Cost" must be > the last number.'; +$lang->task->error->consumedThisTime = 'Please enter "Hours Cost"'; +$lang->task->error->left = 'Please enter "Hours Left"'; +$lang->task->error->work = '"Comment" must be < %d characters.'; +$lang->task->error->skipClose = 'Task: %s is not "Finished” or “Cancelled”. Do you want to close it?'; +$lang->task->error->consumed = 'Task: %s hour must be < 0. Ignore changes to this task.'; +$lang->task->error->assignedTo = 'Multi-user task in the current status cannot be assigned to a member who is not in the task team.'; +$lang->task->error->consumedEmpty = '"Current Cost" should not be 0.'; +$lang->task->error->deadlineSmall = '"Deadline" must be greater than "StartDate".'; +$lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; +$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 ba5ace3d25..576ee993c9 100644 --- a/module/task/lang/fr.php +++ b/module/task/lang/fr.php @@ -200,22 +200,22 @@ $lang->task->cannotDeleteParent = 'Impossible de supprimer la tâche parente' $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->error = new stdclass(); -$lang->task->error->totalNumber = '"Coût Total" doit être numérique.'; -$lang->task->error->consumedNumber = '"Coût" doit être numérique.'; -$lang->task->error->estimateNumber = '"Estimé" doit être numérique.'; -$lang->task->error->leftNumber = '"Entrez" doit être numérique.'; -$lang->task->error->recordMinus = 'Les heures de travail ne doivent pas être un nombre négatif.'; -$lang->task->error->consumedSmall = '"Coût Total" doit être > au dernier chiffre.'; -$lang->task->error->consumedThisTime = 'Entrez le "Coût en Heures"'; -$lang->task->error->left = 'Entrez les "Heures Restantes"'; -$lang->task->error->work = '"Commentaire" doit être < %d caractères.'; -$lang->task->error->skipClose = 'Tâche: %s non “Finie” ou “Annulée”. Voulez-vous la fermer malgré tout ?'; -$lang->task->error->consumed = 'Tâche: %s heures doivent être < 0. Ignorer changements de cette tâche.'; -$lang->task->error->assignedTo = "Tâche Multi-user dans le statut courant ne peut pas être assignée à un membre qui ne fait pas partie de l'équipe."; -$lang->task->error->consumedEmpty = '"Coût Actuel" ne devrait pas être 0.'; -$lang->task->error->deadlineSmall = '"Date Limite" doit être supérieur à la "Date de Départ".'; -$lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; -$lang->task->error->chooseOtherParent = 'the currently selected parent task has been consumed, please select another parent task.'; +$lang->task->error->totalNumber = '"Coût Total" doit être numérique.'; +$lang->task->error->consumedNumber = '"Coût" doit être numérique.'; +$lang->task->error->estimateNumber = '"Estimé" doit être numérique.'; +$lang->task->error->leftNumber = '"Entrez" doit être numérique.'; +$lang->task->error->recordMinus = 'Les heures de travail ne doivent pas être un nombre négatif.'; +$lang->task->error->consumedSmall = '"Coût Total" doit être > au dernier chiffre.'; +$lang->task->error->consumedThisTime = 'Entrez le "Coût en Heures"'; +$lang->task->error->left = 'Entrez les "Heures Restantes"'; +$lang->task->error->work = '"Commentaire" doit être < %d caractères.'; +$lang->task->error->skipClose = 'Tâche: %s non “Finie” ou “Annulée”. Voulez-vous la fermer malgré tout ?'; +$lang->task->error->consumed = 'Tâche: %s heures doivent être < 0. Ignorer changements de cette tâche.'; +$lang->task->error->assignedTo = "Tâche Multi-user dans le statut courant ne peut pas être assignée à un membre qui ne fait pas partie de l'équipe."; +$lang->task->error->consumedEmpty = '"Coût Actuel" ne devrait pas être 0.'; +$lang->task->error->deadlineSmall = '"Date Limite" doit être supérieur à la "Date de Départ".'; +$lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; +$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 45ca76f4e6..d2e0c3d3b2 100644 --- a/module/task/lang/vi.php +++ b/module/task/lang/vi.php @@ -200,22 +200,22 @@ $lang->task->cannotDeleteParent = 'Không thể xóa nhiệm vụ cha'; $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->error = new stdclass(); -$lang->task->error->totalNumber = '"Total Cost" must be numbers.'; -$lang->task->error->consumedNumber = '"Giờ làm" phải là số.'; -$lang->task->error->estimateNumber = '"Dự tính" phải là số.'; -$lang->task->error->leftNumber = '"Left" must be numbers.'; -$lang->task->error->recordMinus = 'Giờ làm không nên là số âm'; -$lang->task->error->consumedSmall = '"Tổng giờ làm" phải là > số cuối cùng.'; -$lang->task->error->consumedThisTime = 'Vui lòng nhập "Số giờ làm"'; -$lang->task->error->left = 'Vui lòng nhập "Giờ còn lại"'; -$lang->task->error->work = '"Nhận xét" phải là < %d ký tự.'; -$lang->task->error->skipClose = 'Nhiệm vụ: %s không là "Kết thúc” hoặc “Đã hủy”. Bạn có muốn đóng nó?'; -$lang->task->error->consumed = 'Nhiệm vụ: %s giờ phải là < 0. Bỏ qua thay đổi cho nhiệm vụ này.'; -$lang->task->error->assignedTo = 'Nhiệm vụ nhiều người dùng trong tình trạng hiện tại không thể giao cho một thành viên người không trong Nhóm nhiệm vụ.'; -$lang->task->error->consumedEmpty = '"Giờ làm" không nên 0.'; -$lang->task->error->deadlineSmall = '"Hạn chót" phải lớn hơn "Ngày bắt đầu".'; -$lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; -$lang->task->error->chooseOtherParent = 'the currently selected parent task has been consumed, please select another parent task.'; +$lang->task->error->totalNumber = '"Total Cost" must be numbers.'; +$lang->task->error->consumedNumber = '"Giờ làm" phải là số.'; +$lang->task->error->estimateNumber = '"Dự tính" phải là số.'; +$lang->task->error->leftNumber = '"Left" must be numbers.'; +$lang->task->error->recordMinus = 'Giờ làm không nên là số âm'; +$lang->task->error->consumedSmall = '"Tổng giờ làm" phải là > số cuối cùng.'; +$lang->task->error->consumedThisTime = 'Vui lòng nhập "Số giờ làm"'; +$lang->task->error->left = 'Vui lòng nhập "Giờ còn lại"'; +$lang->task->error->work = '"Nhận xét" phải là < %d ký tự.'; +$lang->task->error->skipClose = 'Nhiệm vụ: %s không là "Kết thúc” hoặc “Đã hủy”. Bạn có muốn đóng nó?'; +$lang->task->error->consumed = 'Nhiệm vụ: %s giờ phải là < 0. Bỏ qua thay đổi cho nhiệm vụ này.'; +$lang->task->error->assignedTo = 'Nhiệm vụ nhiều người dùng trong tình trạng hiện tại không thể giao cho một thành viên người không trong Nhóm nhiệm vụ.'; +$lang->task->error->consumedEmpty = '"Giờ làm" không nên 0.'; +$lang->task->error->deadlineSmall = '"Hạn chót" phải lớn hơn "Ngày bắt đầu".'; +$lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; +$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 02ce63511e..485f99f3f0 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -199,23 +199,23 @@ $lang->task->createDenied = '你不能在该项目添加任务'; $lang->task->cannotDeleteParent = '不能删除父任务。'; $lang->task->addChildTask = '因该任务已经产生消耗,为保证数据一致性,我们会帮您创建一条同名子任务记录该消耗。'; -$lang->task->error = new stdclass(); -$lang->task->error->totalNumber = '"总计消耗"必须为数字'; -$lang->task->error->consumedNumber = '"本次消耗"必须为数字'; -$lang->task->error->estimateNumber = '"最初预计"必须为数字'; -$lang->task->error->leftNumber = '"预计剩余"必须为数字'; -$lang->task->error->recordMinus = '工时不能为负数'; -$lang->task->error->consumedSmall = '"总计消耗"必须大于之前消耗'; -$lang->task->error->consumedThisTime = '请填写"工时"'; -$lang->task->error->left = '请填写"剩余"'; -$lang->task->error->work = '"备注"必须小于%d个字符'; -$lang->task->error->skipClose = '任务:%s 不是“已完成”或“已取消”状态,确定要关闭吗?'; -$lang->task->error->consumed = '任务:%s工时不能小于0,忽略该任务工时的改动'; -$lang->task->error->assignedTo = '当前状态的多人任务不能指派给任务团队外的成员。'; -$lang->task->error->consumedEmpty = '"本次消耗"不能为0'; -$lang->task->error->deadlineSmall = '"截止日期"必须大于"预计开始"'; -$lang->task->error->alreadyStarted = '此任务已被启动,不能重复启动!'; -$lang->task->error->chooseOtherParent = '当前选中的父任务已有消耗,请选择其他父任务。'; +$lang->task->error = new stdclass(); +$lang->task->error->totalNumber = '"总计消耗"必须为数字'; +$lang->task->error->consumedNumber = '"本次消耗"必须为数字'; +$lang->task->error->estimateNumber = '"最初预计"必须为数字'; +$lang->task->error->leftNumber = '"预计剩余"必须为数字'; +$lang->task->error->recordMinus = '工时不能为负数'; +$lang->task->error->consumedSmall = '"总计消耗"必须大于之前消耗'; +$lang->task->error->consumedThisTime = '请填写"工时"'; +$lang->task->error->left = '请填写"剩余"'; +$lang->task->error->work = '"备注"必须小于%d个字符'; +$lang->task->error->skipClose = '任务:%s 不是“已完成”或“已取消”状态,确定要关闭吗?'; +$lang->task->error->consumed = '任务:%s工时不能小于0,忽略该任务工时的改动'; +$lang->task->error->assignedTo = '当前状态的多人任务不能指派给任务团队外的成员。'; +$lang->task->error->consumedEmpty = '"本次消耗"不能为0'; +$lang->task->error->deadlineSmall = '"截止日期"必须大于"预计开始"'; +$lang->task->error->alreadyStarted = '此任务已被启动,不能重复启动!'; +$lang->task->error->alreadyConsumed = '当前选中的父任务已有消耗。'; /* Report. */ $lang->task->report = new stdclass(); diff --git a/module/task/model.php b/module/task/model.php index 3f9e9ae59a..0a56cb77b0 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -745,7 +745,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();