From c0e5bf03f06b3ae424547c108320b4b6ac06f073 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Wed, 21 Oct 2020 09:48:40 +0800 Subject: [PATCH] * Adjustment language files. --- module/programplan/control.php | 3 +- module/programplan/lang/de.php | 69 ------------------------- module/programplan/lang/en.php | 4 -- module/programplan/lang/fr.php | 4 -- module/programplan/lang/vi.php | 4 -- module/programplan/lang/zh-cn.php | 4 -- module/programplan/lang/zh-tw.php | 4 -- module/programplan/view/create.html.php | 10 ++-- module/programplan/view/edit.html.php | 4 +- module/user/model.php | 4 +- 10 files changed, 11 insertions(+), 99 deletions(-) delete mode 100644 module/programplan/lang/de.php diff --git a/module/programplan/control.php b/module/programplan/control.php index c2dddd230c..da9161db3e 100644 --- a/module/programplan/control.php +++ b/module/programplan/control.php @@ -111,6 +111,7 @@ class programplan extends control public function create($programID = 0, $productID = 0, $planID = 0) { $this->commonAction($programID, $productID); + $this->app->loadLang('project'); if($_POST) { $this->programplan->create($programID, $this->productID, $planID); @@ -158,8 +159,8 @@ class programplan extends control */ public function edit($planID = 0, $programID = 0) { + $this->app->loadLang('project'); $plan = $this->programplan->getByID($planID); - if($_POST) { $changes = $this->programplan->update($planID, $programID); diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php deleted file mode 100644 index a58599572e..0000000000 --- a/module/programplan/lang/de.php +++ /dev/null @@ -1,69 +0,0 @@ - - * @package programplan - * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ - * @link http://www.zentao.net - */ -$lang->programplan->common = 'Program Plan'; -$lang->programplan->browse = 'Program Plan'; -$lang->programplan->gantt = 'Gantt Chart'; -$lang->programplan->list = 'Stage List'; -$lang->programplan->create = 'Create'; -$lang->programplan->edit = 'Edit'; -$lang->programplan->delete = 'Delete'; -$lang->programplan->createSubPlan = 'Create Sub Plan'; - -$lang->programplan->parent = 'Parent Stage'; -$lang->programplan->emptyParent = 'N/A'; -$lang->programplan->name = 'Name'; -$lang->programplan->percent = 'Plan Workload'; -$lang->programplan->percentAB = 'Plan Workload'; -$lang->programplan->planPercent = 'Workload'; -$lang->programplan->attribute = 'Stage'; -$lang->programplan->milestone = 'Milestone'; -$lang->programplan->taskProgress = 'Task Progress'; -$lang->programplan->task = 'Task'; -$lang->programplan->begin = 'Begin'; -$lang->programplan->end = 'End'; -$lang->programplan->realBegan = 'Actual Started'; -$lang->programplan->realEnd = 'Actual End'; -$lang->programplan->output = 'Output'; -$lang->programplan->openedBy = 'Created By'; -$lang->programplan->openedDate = 'Created Date'; -$lang->programplan->editedBy = 'Edited By'; -$lang->programplan->editedDate = 'Edited Date'; -$lang->programplan->duration = 'Duration'; -$lang->programplan->version = 'Version'; -$lang->programplan->full = 'Full Screen'; -$lang->programplan->today = 'Today'; -$lang->programplan->exporting = 'Exporting'; -$lang->programplan->exportFail = 'Export failed'; -$lang->programplan->hideCriticalPath = 'Hide Critical Path'; -$lang->programplan->showCriticalPath = 'Show Critical Path'; -$lang->programplan->accessRight = 'Access Control'; - -$lang->programplan->milestoneList[1] = 'Yes'; -$lang->programplan->milestoneList[0] = 'No'; - -$lang->programplan->accessRights['open'] = 'Inherited Project ACL (for who can access the current project)'; -$lang->programplan->accessRights['private'] = 'Private (for team members and project stakeholders)'; - -$lang->programplan->noData = 'No Data'; -$lang->programplan->children = 'Sub Plan'; -$lang->programplan->childrenAB = 'Child'; -$lang->programplan->confirmDelete = 'Do you want to delete the current plan?'; - -$lang->programplan->stageCustom = new stdClass(); -$lang->programplan->stageCustom->date = 'Show Date'; -$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->createdTask = 'The task has been decomposed. Sub phases cannot be added.'; diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php index a58599572e..07c61855b5 100644 --- a/module/programplan/lang/en.php +++ b/module/programplan/lang/en.php @@ -45,14 +45,10 @@ $lang->programplan->exporting = 'Exporting'; $lang->programplan->exportFail = 'Export failed'; $lang->programplan->hideCriticalPath = 'Hide Critical Path'; $lang->programplan->showCriticalPath = 'Show Critical Path'; -$lang->programplan->accessRight = 'Access Control'; $lang->programplan->milestoneList[1] = 'Yes'; $lang->programplan->milestoneList[0] = 'No'; -$lang->programplan->accessRights['open'] = 'Inherited Project ACL (for who can access the current project)'; -$lang->programplan->accessRights['private'] = 'Private (for team members and project stakeholders)'; - $lang->programplan->noData = 'No Data'; $lang->programplan->children = 'Sub Plan'; $lang->programplan->childrenAB = 'Child'; diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php index a58599572e..07c61855b5 100644 --- a/module/programplan/lang/fr.php +++ b/module/programplan/lang/fr.php @@ -45,14 +45,10 @@ $lang->programplan->exporting = 'Exporting'; $lang->programplan->exportFail = 'Export failed'; $lang->programplan->hideCriticalPath = 'Hide Critical Path'; $lang->programplan->showCriticalPath = 'Show Critical Path'; -$lang->programplan->accessRight = 'Access Control'; $lang->programplan->milestoneList[1] = 'Yes'; $lang->programplan->milestoneList[0] = 'No'; -$lang->programplan->accessRights['open'] = 'Inherited Project ACL (for who can access the current project)'; -$lang->programplan->accessRights['private'] = 'Private (for team members and project stakeholders)'; - $lang->programplan->noData = 'No Data'; $lang->programplan->children = 'Sub Plan'; $lang->programplan->childrenAB = 'Child'; diff --git a/module/programplan/lang/vi.php b/module/programplan/lang/vi.php index a58599572e..07c61855b5 100644 --- a/module/programplan/lang/vi.php +++ b/module/programplan/lang/vi.php @@ -45,14 +45,10 @@ $lang->programplan->exporting = 'Exporting'; $lang->programplan->exportFail = 'Export failed'; $lang->programplan->hideCriticalPath = 'Hide Critical Path'; $lang->programplan->showCriticalPath = 'Show Critical Path'; -$lang->programplan->accessRight = 'Access Control'; $lang->programplan->milestoneList[1] = 'Yes'; $lang->programplan->milestoneList[0] = 'No'; -$lang->programplan->accessRights['open'] = 'Inherited Project ACL (for who can access the current project)'; -$lang->programplan->accessRights['private'] = 'Private (for team members and project stakeholders)'; - $lang->programplan->noData = 'No Data'; $lang->programplan->children = 'Sub Plan'; $lang->programplan->childrenAB = 'Child'; diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php index 315948430f..4fde9a5b09 100644 --- a/module/programplan/lang/zh-cn.php +++ b/module/programplan/lang/zh-cn.php @@ -45,14 +45,10 @@ $lang->programplan->exporting = '导出'; $lang->programplan->exportFail = '导出失败'; $lang->programplan->hideCriticalPath = '隐藏关键路径'; $lang->programplan->showCriticalPath = '显示关键路径'; -$lang->programplan->accessRight = '访问控制'; $lang->programplan->milestoneList[1] = '是'; $lang->programplan->milestoneList[0] = '否'; -$lang->programplan->accessRights['open'] = '继承项目访问权限 (能访问当前项目，即可访问)'; -$lang->programplan->accessRights['private'] = '私有 (团队成员和项目干系人可访问)'; - $lang->programplan->noData = '暂无数据。'; $lang->programplan->children = '二级计划'; $lang->programplan->childrenAB = '子'; diff --git a/module/programplan/lang/zh-tw.php b/module/programplan/lang/zh-tw.php index 911886b8f7..b9b58ff94a 100644 --- a/module/programplan/lang/zh-tw.php +++ b/module/programplan/lang/zh-tw.php @@ -45,14 +45,10 @@ $lang->programplan->exporting = '導出'; $lang->programplan->exportFail = '導出失敗'; $lang->programplan->hideCriticalPath = '隱藏關鍵路徑'; $lang->programplan->showCriticalPath = '顯示關鍵路徑'; -$lang->programplan->accessRight = '訪問控制'; $lang->programplan->milestoneList[1] = '是'; $lang->programplan->milestoneList[0] = '否'; -$lang->programplan->accessRights['open'] = '繼承項目訪問權限 (能訪問當前項目，即可訪問)'; -$lang->programplan->accessRights['private'] = '私有 (團隊成員和項目干係人可訪問)'; - $lang->programplan->noData = '暫無數據。'; $lang->programplan->children = '二級計劃'; $lang->programplan->childrenAB = '子'; diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php index 6a68b50767..ffe73435bb 100644 --- a/module/programplan/view/create.html.php +++ b/module/programplan/view/create.html.php @@ -28,7 +28,7 @@ programplan->name;?> programplan->percent;?> programplan->attribute;?> - programplan->accessRight;?> + project->acl;?> programplan->milestone;?> programplan->begin;?> programplan->end;?> @@ -50,7 +50,7 @@ stage->typeList, $stage->type, "class='form-control'");?> - programplan->accessRights, 'open', 'class="form-control"');?> + project->aclList, 'open', 'class="form-control"');?> programplan->milestoneList, 0);?> @@ -78,7 +78,7 @@ stage->typeList, $plan->attribute, "class='form-control'");?> - programplan->accessRights, $plan->acl, 'class="form-control"');?> + project->aclList, $plan->acl, 'class="form-control"');?> programplan->milestoneList, $plan->milestone, $disabled);?> @@ -103,7 +103,7 @@ stage->typeList, '', "class='form-control'");?> - programplan->accessRights, 'open', 'class="form-control"');?> + project->aclList, 'open', 'class="form-control"');?> programplan->milestoneList, 0);?> @@ -139,7 +139,7 @@ stage->typeList, '', "class='form-control'");?> - programplan->accessRights, 'open', 'class="form-control"');?> + project->aclList, 'open', 'class="form-control"');?> programplan->milestoneList, 0);?> diff --git a/module/programplan/view/edit.html.php b/module/programplan/view/edit.html.php index 5da3ffb450..ff40e7fbdc 100644 --- a/module/programplan/view/edit.html.php +++ b/module/programplan/view/edit.html.php @@ -58,8 +58,8 @@ js::set('parentID', $plan->parent); milestone);?> - programplan->accessRight;?> - programplan->accessRights, $plan->acl, 'class="form-control"');?> + project->acl;?> + project->aclList, $plan->acl, 'class="form-control"');?> programplan->begin;?> diff --git a/module/user/model.php b/module/user/model.php index 83f9f8d815..b88ff08521 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -1832,7 +1832,7 @@ class userModel extends model */ public function updateSprintView($sprintIdList, $users) { - $sprints = $this->dao->select('id, PM, PO, QD, RD, openedBy, acl, parent, path, grade, type')->from(TABLE_PROJECT) + $sprints = $this->dao->select('id, project, PM, PO, QD, RD, openedBy, acl, parent, path, grade, type')->from(TABLE_PROJECT) ->where('id')->in($sprintIdList) ->andWhere('acl')->ne('open') ->fetchAll('id'); @@ -1850,7 +1850,7 @@ class userModel extends model foreach($sprints as $sprintID => $sprint) { $projectIdList[$sprint->parent] = $sprint->parent; - $sprint->project = $projectID; + $sprint->project = $sprint->project; } /* Get parent project stakeholders. */