From d88700a2e72c3ba6435b641e04b522344e00b369 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 13 Sep 2022 10:35:56 +0800 Subject: [PATCH] * adjust for notice manage task team. --- module/task/lang/de.php | 1 + module/task/lang/en.php | 1 + module/task/lang/fr.php | 1 + module/task/lang/zh-cn.php | 3 ++- module/task/view/taskteam.html.php | 7 +++++++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/module/task/lang/de.php b/module/task/lang/de.php index 816adcc8aa..c52b90ff42 100644 --- a/module/task/lang/de.php +++ b/module/task/lang/de.php @@ -236,6 +236,7 @@ $lang->task->confirmTransfer = '"Left Hour" is 0,Do you want to assi $lang->task->noticeTaskStart = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.'; $lang->task->noticeLinkStory = "Es wurde keine Story verknüpft. Sie können %s für dieses Projekt, anschließend %s."; $lang->task->noticeSaveRecord = 'Ihre Stunden wurden nicht gespeichrt. Bitte erst speichern.'; +$lang->task->noticeManageTeam = 'Task status is %s, can not manage team.'; $lang->task->commentActions = '%s. %s, kommentiert von %s.'; $lang->task->deniedNotice = 'Nur %s kann die Aufgabe %s.'; $lang->task->deniedStatusNotice = 'The task status is %s, the effort cannot be maintained.'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index c4d44a19b8..fa64e7507a 100755 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -236,6 +236,7 @@ $lang->task->confirmTransfer = '"Left Hour" is 0,Do you want to assi $lang->task->noticeTaskStart = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.'; $lang->task->noticeLinkStory = "No story has been linked. You can %s for this project, then %s."; $lang->task->noticeSaveRecord = 'Your Hour is not saved. Please save it first.'; +$lang->task->noticeManageTeam = 'Task status is %s, can not manage team.'; $lang->task->commentActions = '%s. %s, commented by %s.'; $lang->task->deniedNotice = 'Only the %s can %s the task.'; $lang->task->deniedStatusNotice = 'The task status is %s, the effort cannot be maintained.'; diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php index eb52bf4018..15ecfa7c73 100644 --- a/module/task/lang/fr.php +++ b/module/task/lang/fr.php @@ -236,6 +236,7 @@ $lang->task->confirmTransfer = '"Left Hour" is 0,Do you want to assi $lang->task->noticeTaskStart = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.'; $lang->task->noticeLinkStory = "Aucune Story n'est associée. Vous pouvez %s pour ce projet, alors %s."; $lang->task->noticeSaveRecord = "Votre temps n'a pas été sauvé. Enregistrez-le d'abord."; +$lang->task->noticeManageTeam = 'Task status is %s, can not manage team.'; $lang->task->commentActions = '%s. %s, commenté par %s.'; $lang->task->deniedNotice = 'Seulement le %s peut %s la tâche.'; $lang->task->deniedStatusNotice = 'The task status is %s, the effort cannot be maintained.'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 1ec42d3afc..a16df3a68c 100755 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -236,6 +236,7 @@ $lang->task->confirmTransfer = '"当前剩余"为0,任务将被指 $lang->task->noticeTaskStart = '"总计消耗"和"预计剩余"不能同时为0'; $lang->task->noticeLinkStory = "没有可关联的相关{$lang->SRCommon},您可以为当前项目%s,然后%s"; $lang->task->noticeSaveRecord = '您有尚未保存的工时记录,请先将其保存。'; +$lang->task->noticeManageTeam = '任务状态是%s,不能维护团队'; $lang->task->commentActions = '%s. %s, 由 %s 添加备注。'; $lang->task->deniedNotice = '当前任务只有%s才可以%s。'; $lang->task->deniedStatusNotice = '当前任务状态是%s,不能维护日志。'; @@ -253,7 +254,7 @@ $lang->task->error->recordMinus = '工时不能为负数'; $lang->task->error->leftNumber = '"预计剩余"必须为数字'; $lang->task->error->recordMinus = '工时不能为负数'; $lang->task->error->consumedSmall = '"总计消耗"必须大于之前消耗'; -$lang->task->error->consumedThisTime = '请填写"工时"'; +$lang->task->error->consumedThisTime = '请填写"消耗"'; $lang->task->error->left = '请填写"剩余"'; $lang->task->error->work = '"备注"必须小于%d个字符'; $lang->task->error->teamMember = '团队成员必须不少于2人'; diff --git a/module/task/view/taskteam.html.php b/module/task/view/taskteam.html.php index 4545f15908..b089ff7803 100644 --- a/module/task/view/taskteam.html.php +++ b/module/task/view/taskteam.html.php @@ -81,6 +81,13 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal status)):?> status);?> lang->task->error->leftEmptyAB, $this->lang->task->statusList[$task->status]));?> +rawMethod == 'edit'):?> + + +
task->noticeManageTeam, zget($lang->task->statusList, $task->status));?>
+ + +