From 8f295018147d20bdb6d70c429003c2ff7cb4907d Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Tue, 9 Mar 2021 15:49:25 +0800 Subject: [PATCH 01/11] * Adjust block module code. --- module/block/lang/zh-cn.php | 6 ++++++ module/block/model.php | 15 +++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 94dd39eb1a..2e62abff07 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -436,6 +436,12 @@ $lang->block->orderByList->product['id_desc'] = 'ID 递减'; $lang->block->orderByList->product['status_asc'] = '状态正序'; $lang->block->orderByList->product['status_desc'] = '状态倒序'; +$lang->block->orderByList->project = array(); +$lang->block->orderByList->project['id_asc'] = 'ID 递增'; +$lang->block->orderByList->project['id_desc'] = 'ID 递减'; +$lang->block->orderByList->project['status_asc'] = '状态正序'; +$lang->block->orderByList->project['status_desc'] = '状态倒序'; + $lang->block->orderByList->execution = array(); $lang->block->orderByList->execution['id_asc'] = 'ID 递增'; $lang->block->orderByList->execution['id_desc'] = 'ID 递减'; diff --git a/module/block/model.php b/module/block/model.php index eed0edcb9f..e36a954795 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -731,13 +731,16 @@ class blockModel extends model $params->bugNum['default'] = 20; $params->bugNum['control'] = 'input'; - $params->riskNum['name'] = $this->lang->block->riskNum; - $params->riskNum['default'] = 20; - $params->riskNum['control'] = 'input'; + if(isset($this->config->maxVersion)) + { + $params->riskNum['name'] = $this->lang->block->riskNum; + $params->riskNum['default'] = 20; + $params->riskNum['control'] = 'input'; - $params->issueNum['name'] = $this->lang->block->issueNum; - $params->issueNum['default'] = 20; - $params->issueNum['control'] = 'input'; + $params->issueNum['name'] = $this->lang->block->issueNum; + $params->issueNum['default'] = 20; + $params->issueNum['control'] = 'input'; + } $params->storyNum['name'] = $this->lang->block->storyNum; $params->storyNum['default'] = 20; From 4ef5e5c1884a7a769d814c4958a1248a18475be7 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Tue, 9 Mar 2021 15:49:43 +0800 Subject: [PATCH 02/11] * Finish task #36460. --- module/project/control.php | 14 +- module/project/lang/de.php | 256 +++++++----------- module/project/lang/en.php | 5 +- module/project/lang/fr.php | 254 ++++++------------ module/project/lang/vi.php | 258 +++++++------------ module/project/lang/zh-cn.php | 3 + module/project/view/ajaxgetdropmenu.html.php | 92 +++---- 7 files changed, 318 insertions(+), 564 deletions(-) diff --git a/module/project/control.php b/module/project/control.php index 81c266e94b..521eb1f836 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -115,20 +115,14 @@ class project extends control */ public function ajaxGetDropMenu($projectID = 0, $module, $method) { - $closedProjects = $this->program->getProjectList(0, 'closed', 0, 'id_desc'); - - $closedProjectNames = array(); - foreach($closedProjects as $project) $closedProjectNames = common::convert2Pinyin($closedProjectNames); - - $closedProjectsHtml = ''; - foreach($closedProjects as $project) $closedProjectsHtml .= html::a($this->createLink('project', 'index', '', '', '', $project->id), '' . $project->name); + $projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->in($this->app->user->view->projects)->andWhere('deleted')->eq(0)->orderBy('parent desc')->fetchAll(); + $this->view->link = helper::createLink('project', 'index', "projectID=%s"); $this->view->projectID = $projectID; + $this->view->projects = $projects; $this->view->module = $module; $this->view->method = $method; - - $this->view->normalProjectsHtml = $this->project->getTreeMenu(0, array('projectmodel', 'createManageLink'), 0, 'dropmenu'); - $this->view->closedProjectsHtml = $closedProjectsHtml; + $this->view->programs = $this->loadModel('program')->getpairs(true); $this->display(); } diff --git a/module/project/lang/de.php b/module/project/lang/de.php index 61ff483f70..2d65ab6180 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -1,66 +1,64 @@ project->createGuide = 'Select Template'; -$lang->project->PRJIndex = 'Dashboard'; -$lang->project->PRJHome = 'Home'; -$lang->project->PRJCreate = 'Create Project'; -$lang->project->PRJEdit = 'Edit'; -$lang->project->PRJBatchEdit = 'Batch Edit Projects'; -$lang->project->PRJView = 'Project View'; -$lang->project->batchEdit = 'Batch Edit'; -$lang->project->PRJBrowse = 'Projects'; -$lang->project->PRJAll = 'All'; -$lang->project->PRJStart = 'Start'; -$lang->project->PRJFinish = 'Finish'; -$lang->project->PRJSuspend = 'Suspend'; -$lang->project->PRJDelete = 'Delete'; -$lang->project->PRJClose = 'Close'; -$lang->project->PRJActivate = 'Activate'; -$lang->project->PRJGroup = 'Privilege Group'; -$lang->project->PRJCreateGroup = 'Create Group'; -$lang->project->PRJEditGroup = 'Edit Group'; -$lang->project->PRJCopyGroup = 'Copy Group'; -$lang->project->PRJManageView = 'Manage View'; -$lang->project->PRJManagePriv = 'Manage Privilege'; -$lang->project->PRJManageMembers = 'Manage Team'; -$lang->project->export = 'Export'; -$lang->project->addProduct = 'Add product'; -$lang->project->PRJManageGroupMember = 'Manage Group'; -$lang->project->PRJModuleSetting = 'List Settings'; -$lang->project->PRJModuleOpen = 'Program Name'; -$lang->project->PRJUpdateOrder = 'Order'; -$lang->project->PRJSort = 'Order'; -$lang->project->PRJWhitelist = 'Project Whitelist'; -$lang->project->PRJAddWhitelist = 'Project Add Whitelist'; -$lang->project->unbindWhielist = 'Project Remove Whitelist'; -$lang->project->PRJManageProducts = 'Manage Products'; -$lang->project->view = 'Program Detail'; -$lang->project->copyTitle = 'Please select an project to copy'; -$lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.'; -$lang->project->errorNoProducts = 'At least one product is associated'; -$lang->project->copyNoProject = 'There are no items available to copy.'; -$lang->project->searchByName = 'Enter the project name to retrieve'; +$lang->project->createGuide = 'Select Template'; +$lang->project->index = 'Dashboard'; +$lang->project->home = 'Home'; +$lang->project->create = 'Create Project'; +$lang->project->edit = 'Edit'; +$lang->project->batchEdit = 'Batch Edit Projects'; +$lang->project->view = 'Project View'; +$lang->project->batchEdit = 'Batch Edit'; +$lang->project->browse = 'Projects'; +$lang->project->all = 'All'; +$lang->project->start = 'Start'; +$lang->project->finish = 'Finish'; +$lang->project->suspend = 'Suspend'; +$lang->project->delete = 'Delete'; +$lang->project->close = 'Close'; +$lang->project->activate = 'Activate'; +$lang->project->group = 'Privilege Group'; +$lang->project->createGroup = 'Create Group'; +$lang->project->editGroup = 'Edit Group'; +$lang->project->copyGroup = 'Copy Group'; +$lang->project->manageView = 'Manage View'; +$lang->project->managePriv = 'Manage Privilege'; +$lang->project->manageMembers = 'Manage Team'; +$lang->project->export = 'Export'; +$lang->project->addProduct = 'Add product'; +$lang->project->manageGroupMember = 'Manage Group'; +$lang->project->moduleSetting = 'List Settings'; +$lang->project->moduleOpen = 'Program Name'; +$lang->project->updateOrder = 'Order'; +$lang->project->sort = 'Order'; +$lang->project->whitelist = 'Project Whitelist'; +$lang->project->addWhitelist = 'Project Add Whitelist'; +$lang->project->unbindWhielist = 'Project Remove Whitelist'; +$lang->project->manageProducts = 'Manage Products'; +$lang->project->copyTitle = 'Please select an project to copy'; +$lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.'; +$lang->project->errorNoProducts = 'At least one product is associated'; +$lang->project->copyNoProject = 'There are no items available to copy.'; +$lang->project->searchByName = 'Enter the project name to search'; /* Fields. */ $lang->project->common = 'Program'; -$lang->project->project = 'Project'; $lang->project->stage = 'Stage'; $lang->project->PM = 'Manager'; -$lang->project->PRJName = 'Name'; -$lang->project->PRJCategory = 'Category'; -$lang->project->PRJDesc = 'Description'; -$lang->project->PRJCode = 'Code'; -$lang->project->PRJCopy = 'Copy'; +$lang->project->name = 'Name'; +$lang->project->category = 'Category'; +$lang->project->desc = 'Description'; +$lang->project->code = 'Code'; +$lang->project->copy = 'Copy'; $lang->project->begin = 'Begin'; $lang->project->end = 'End'; -$lang->project->PRJStatus = 'Status'; -$lang->project->PRJPM = 'Manager'; -$lang->project->PRJBudget = 'Budget'; -$lang->project->PRJTemplate = 'Template'; -$lang->project->PRJEstimate = 'Estimates'; -$lang->project->PRJConsume = 'Cost'; -$lang->project->PRJSurplus = 'Left'; -$lang->project->PRJProgress = 'Progress'; +$lang->project->status = 'Status'; +$lang->project->PM = 'Manager'; +$lang->project->budget = 'Budget'; +$lang->project->template = 'Template'; +$lang->project->estimate = 'Estimates'; +$lang->project->consume = 'Cost'; +$lang->project->surplus = 'Left'; +$lang->project->progress = 'Progress'; $lang->project->dateRange = 'Duration'; $lang->project->to = ' to '; $lang->project->realEnd = 'Actual End'; @@ -68,6 +66,9 @@ $lang->project->realBegan = 'Actual Began'; $lang->project->bygrid = 'Kanban'; $lang->project->bylist = 'List'; $lang->project->mine = 'My'; +$lang->project->myProject = 'Meine Zuständigkeit:'; +$lang->project->other = 'Andere:'; +$lang->project->acl = 'Access control'; $lang->project->setPlanduration = 'Set Duration'; $lang->project->auth = 'Access Control'; $lang->project->durationEstimation = 'Estimated Workload'; @@ -75,10 +76,11 @@ $lang->project->teamCount = 'Man'; $lang->project->leftStories = 'Left Stories'; $lang->project->leftTasks = 'Left Tasks'; $lang->project->leftBugs = 'Left Bugs'; -$lang->project->PRJChildren = 'Child Project'; -$lang->project->PRJParent = 'Parent Project'; +$lang->project->children = 'Child Project'; +$lang->project->parent = 'Parent Project'; $lang->project->allStories = 'All Stories'; $lang->project->doneStories = 'Finished Stories'; +$lang->project->doneProjects = 'Erledigt'; $lang->project->allInput = 'Total Input'; $lang->project->weekly = 'Program Weekly'; $lang->project->pv = 'PV'; @@ -86,10 +88,10 @@ $lang->project->ev = 'EV'; $lang->project->sv = 'SV%'; $lang->project->ac = 'AC'; $lang->project->cv = 'CV%'; -$lang->project->PRJTeamCount = 'Team'; -$lang->project->PRJLongTime = 'Long-Term Project'; +$lang->project->teamCount = 'Team'; +$lang->project->longTime = 'Long-Term Project'; $lang->project->future = 'TBD'; -$lang->project->morePRJ = 'More Project'; +$lang->project->moreProject = 'More Project'; $lang->project->productNotEmpty = 'Please link products or create products.'; $lang->project->existProductName = 'Product name already exists.'; @@ -139,35 +141,20 @@ $lang->project->currencySymbol['SGD'] = 'S$'; $lang->project->modelList['scrum'] = "Scrum"; $lang->project->modelList['waterfall'] = "CMMI"; -$lang->project->PRJCategoryList['single'] = "Single product"; -$lang->project->PRJCategoryList['multiple'] = "Multiple products"; - -$lang->project->PRJLifeTimeList['short'] = "Short-Term"; -$lang->project->PRJLifeTimeList['long'] = "Long-Term"; -$lang->project->PRJLifeTimeList['ops'] = "DevOps"; - $lang->project->featureBar['all'] = 'All'; $lang->project->featureBar['doing'] = 'Going'; $lang->project->featureBar['wait'] = 'Waiting'; $lang->project->featureBar['suspended'] = 'Suspended'; $lang->project->featureBar['closed'] = 'Closed'; -$lang->project->PRJAclList['private'] = 'Private (For team members and stakeholders only)'; -$lang->project->PRJAclList['open'] = "Open (accessible with project view permissions)"; +$lang->project->aclList['private'] = 'Private (For team members and stakeholders only)'; +$lang->project->aclList['open'] = "Open (accessible with project view permissions)"; -$lang->project->PRJAcls['private'] = 'Private'; -$lang->project->PRJAcls['open'] = "Open"; +$lang->project->acls['private'] = 'Private'; +$lang->project->acls['open'] = "Open"; -$lang->project->PGMPRJAclList['private'] = "Private (For team members and stakeholders only)"; -$lang->project->PGMPRJAclList['project'] = "Public within the project set (accessible to all higher-level project set leaders and stakeholders, members of this project team and stakeholders)"; -$lang->project->PGMPRJAclList['open'] = "Full disclosure (accessible with project view permissions)"; - -$lang->project->PGMPRJAcls['private'] = "Private"; -$lang->project->PGMPRJAcls['project'] = "Public within the project set"; -$lang->project->PGMPRJAcls['open'] = "Full disclosure"; - -$lang->project->PRJAuthList['extend'] = 'Inherit (system privilege and project privilege)'; -$lang->project->PRJAuthList['reset'] = 'Reset (project privilege only)'; +$lang->project->authList['extend'] = 'Inherit (system privilege and project privilege)'; +$lang->project->authList['reset'] = 'Reset (project privilege only)'; $lang->project->statusList['wait'] = 'Waiting'; $lang->project->statusList['doing'] = 'Doing'; @@ -180,7 +167,7 @@ $lang->project->endList[186] = 'Half yearly'; $lang->project->endList[365] = 'One year'; $lang->project->endList[999] = 'Longtime'; -$lang->project->noPRJ = 'No project.'; +$lang->project->empty = 'No project.'; $lang->project->accessDenied = 'Access denied!'; $lang->project->chooseProgramType = 'Select the project management model'; $lang->project->nextStep = 'Next step'; @@ -202,93 +189,22 @@ $lang->project->childLongTime = "If a child as long-term projects, the $lang->project->readjustTime = 'Change the project begin&end date.'; $lang->project->notAllowRemoveProducts = 'The story of this product is linked with the project. Unlink it before doing any action.'; -$lang->project->PRJProgramTitle['0'] = 'Hide'; -$lang->project->PRJProgramTitle['base'] = 'Base-level project only'; -$lang->project->PRJProgramTitle['end'] = 'End-level project only'; +$lang->project->programTitle['0'] = 'Hide'; +$lang->project->programTitle['base'] = 'Base-level project only'; +$lang->project->programTitle['end'] = 'End-level project only'; -$lang->project->PRJAccessDenied = 'Access denied to this project'; -$lang->project->PRJChooseProgramType = 'Select management type'; -$lang->project->scrumTitle = 'Agile Development Management'; -$lang->project->PRJCannotCreateChild = 'The project has contents, so you cannot add a child project. You can create a parent project for this one and then add a child project for the parent project.'; -$lang->project->PRJHasChildren = 'This project has a child project, so it cannot be deleted.'; -$lang->project->PRJConfirmDelete = 'Do you want to delete this project?'; -$lang->project->PRJCannotChangeToCat = "The project has contents, so you cannot it to a parent project."; -$lang->project->PRJCannotCancelCat = "There are child projects of this project. You cannot cancel the parent project mark."; -$lang->project->PRJParentBeginEnd = "The begin and end date of the parent project: %s ~ %s"; -$lang->project->PRJParentBudget = "The budget of the parent project: %s"; -$lang->project->PRJBeginLetterParent = "The begin date of the parent project: %s. It cannot be < the begin date of its parent project."; -$lang->project->PRJEndGreaterParent = "The end date of the parent project: %s. It cannot be > the end date of its parent project."; -$lang->project->PRJBeginGreateChild = "The minimum start date of the project set: %s. The start date of the project cannot be less than the minimum start date of the project set."; -$lang->project->PRJEndLetterChild = "The maximum finish date for the project set: %s. The completion date of a project cannot be greater than the maximum completion date of the project set."; -$lang->project->PRJChildLongTime = "There are long-term projects in the child project, and the parent project should also be a long-term project."; - -/* Actions. */ -$lang->project->PGMCommon = 'Program'; -$lang->project->PGMIndex = 'Home'; -$lang->project->PGMCreate = 'Create Program'; -$lang->project->PGMCreateGuide = 'Select Template'; -$lang->project->PGMEdit = 'Edit Program'; -$lang->project->PGMBrowse = 'Programs'; -$lang->project->PGMProduct = 'Products'; -$lang->project->PGMProject = 'Program Project List'; -$lang->project->PGMAll = 'All Programs'; -$lang->project->PGMStart = 'Start'; -$lang->project->PGMFinish = 'Finish'; -$lang->project->PGMSuspend = 'Suspend'; -$lang->project->PGMDelete = 'Delete'; -$lang->project->PGMClose = 'Close'; -$lang->project->PGMActivate = 'Activate'; -$lang->project->PGMExport = 'Export'; -$lang->project->PGMStakeholder = 'Stakeholder'; -$lang->project->createStakeholder = 'Create Stakeholder'; -$lang->project->unlinkStakeholder = 'Unlink Stakeholder'; -$lang->project->batchUnlinkStakeholders = 'Batch Remove Stakeholder'; -$lang->project->unlink = 'Unlink'; -$lang->project->morePGM = 'More Programs'; -$lang->project->confirmBatchUnlink = "Do you want to batch unlink these stakeholders?"; -$lang->project->stakeholderType = 'Stakeholder type'; -$lang->project->isStakeholderKey = 'Key stakeholder'; -$lang->project->importStakeholder = 'Import project'; -$lang->project->PGMManageMembers = 'Program Team'; -$lang->project->PGMParentBudget = 'Parent project surplus budget：'; -$lang->project->beyondParentBudget = 'The remaining budget of the owned project has been exceeded.'; -$lang->project->PGMBeginLetterParent = "Parent begin date: %s, begin date should be > = parent begin date."; -$lang->project->PGMEndGreaterParent = "Parent end date: %s, end date should be < = parent end date."; -$lang->project->PGMBeginGreateChild = "Child earliest begin: %s, parent begin date < = child earliest begin date."; -$lang->project->PGMEndLetterChild = "Child latest end: %s, parent end date > = child latest end date."; -$lang->project->PGMCloseErrorMessage = 'There are subprojects or projects that are not closed'; - -$lang->project->stakeholderTypeList['inside'] = 'Inside'; -$lang->project->stakeholderTypeList['outside'] = 'Outside'; - -/* Fields. */ -$lang->project->PGMName = 'Name'; -$lang->project->PGMTemplate = 'Template'; -$lang->project->PGMCategory = 'Type'; -$lang->project->PGMDesc = 'Description'; -$lang->project->PGMCopy = 'Copy Program'; -$lang->project->PGMStatus = 'Status'; -$lang->project->PGMPM = 'Manager'; -$lang->project->PGMBudget = 'Budget'; -$lang->project->PGMProgress = 'Progress'; -$lang->project->PGMChildren = 'Child'; -$lang->project->PGMParent = 'Parent'; -$lang->project->PGMAllInput = 'Input'; -$lang->project->PGMTeamCount = 'Team'; -$lang->project->PGMLongTime = 'Long-Term'; - -$lang->project->noPGM = 'No project.'; -$lang->project->PGMShowClosed = 'Closed projects.'; -$lang->project->PGMTips = 'If a parent item set is selected, products under that parent item set can be associated. If no item set is selected, a product with the same name as the item is created by default and associated with that item.'; - -$lang->project->PGMAclList['private'] = "Private (accessible to project portfolio holders and stakeholders, stakeholders can follow up maintenance)"; -$lang->project->PGMAclList['open'] = "Default(user who can visit the project can access it)"; - -$lang->project->subPGMAclList['private'] = "Private (accessible to this project set leader and stakeholders, stakeholders can follow up maintenance)"; -$lang->project->subPGMAclList['open'] = "Default(user who can visit the project can access it)"; -$lang->project->subPGMAclList['project'] = "Open within the project (accessible to all higher-level project directors and affiliates, as well as to this project director and affiliates)"; - -$lang->project->PGMAuthList['extend'] = 'Inherit(project privileges and company privileges)'; -$lang->project->PGMAuthList['reset'] = 'Reset(project privileges only)'; - -$lang->project->PGMFeatureBar['all'] = 'All'; +$lang->project->accessDenied = 'Access denied to this project'; +$lang->project->chooseProgramType = 'Select management type'; +$lang->project->scrumTitle = 'Agile Development Management'; +$lang->project->cannotCreateChild = 'The project has contents, so you cannot add a child project. You can create a parent project for this one and then add a child project for the parent project.'; +$lang->project->hasChildren = 'This project has a child project, so it cannot be deleted.'; +$lang->project->confirmDelete = 'Do you want to delete this project?'; +$lang->project->cannotChangeToCat = "The project has contents, so you cannot it to a parent project."; +$lang->project->cannotCancelCat = "There are child projects of this project. You cannot cancel the parent project mark."; +$lang->project->parentBeginEnd = "The begin and end date of the parent project: %s ~ %s"; +$lang->project->parentBudget = "The budget of the parent project: %s"; +$lang->project->beginLetterParent = "The begin date of the parent project: %s. It cannot be < the begin date of its parent project."; +$lang->project->endGreaterParent = "The end date of the parent project: %s. It cannot be > the end date of its parent project."; +$lang->project->beginGreateChild = "The minimum start date of the project set: %s. The start date of the project cannot be less than the minimum start date of the project set."; +$lang->project->endLetterChild = "The maximum finish date for the project set: %s. The completion date of a project cannot be greater than the maximum completion date of the project set."; +$lang->project->childLongTime = "There are long-term projects in the child project, and the parent project should also be a long-term project."; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index e36265e263..faa1844a40 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -66,7 +66,9 @@ $lang->project->realBegan = 'Actual Began'; $lang->project->bygrid = 'Kanban'; $lang->project->bylist = 'List'; $lang->project->mine = 'My'; -$lang->project->acl = 'Access Control'; +$lang->project->myProject = 'Mine: '; +$lang->project->other = 'Others: '; +$lang->project->acl = 'Access control'; $lang->project->setPlanduration = 'Set Duration'; $lang->project->auth = 'Access Control'; $lang->project->durationEstimation = 'Estimated Workload'; @@ -78,6 +80,7 @@ $lang->project->children = 'Child Project'; $lang->project->parent = 'Parent Project'; $lang->project->allStories = 'All Stories'; $lang->project->doneStories = 'Finished Stories'; +$lang->project->doneProjects = 'Finished'; $lang->project->allInput = 'Total Input'; $lang->project->weekly = 'Program Weekly'; $lang->project->pv = 'PV'; diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index ba47a0f202..cda4d867f9 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -1,66 +1,64 @@ project->createGuide = 'Select Template'; -$lang->project->PRJIndex = 'Dashboard'; -$lang->project->PRJHome = 'Home'; -$lang->project->PRJCreate = 'Create Project'; -$lang->project->PRJEdit = 'Edit'; -$lang->project->PRJBatchEdit = 'Batch Edit Projects'; -$lang->project->PRJView = 'Project View'; -$lang->project->batchEdit = 'Batch Edit'; -$lang->project->PRJBrowse = 'Projects'; -$lang->project->PRJAll = 'All'; -$lang->project->PRJStart = 'Start'; -$lang->project->PRJFinish = 'Finish'; -$lang->project->PRJSuspend = 'Suspend'; -$lang->project->PRJDelete = 'Delete'; -$lang->project->PRJClose = 'Close'; -$lang->project->PRJActivate = 'Activate'; -$lang->project->PRJGroup = 'Privilege Group'; -$lang->project->PRJCreateGroup = 'Create Group'; -$lang->project->PRJEditGroup = 'Edit Group'; -$lang->project->PRJCopyGroup = 'Copy Group'; -$lang->project->PRJManageView = 'Manage View'; -$lang->project->PRJManagePriv = 'Manage Privilege'; -$lang->project->PRJManageMembers = 'Manage Team'; -$lang->project->export = 'Export'; -$lang->project->addProduct = 'Add product'; -$lang->project->PRJManageGroupMember = 'Manage Group'; -$lang->project->PRJModuleSetting = 'List Settings'; -$lang->project->PRJModuleOpen = 'Program Name'; -$lang->project->PRJUpdateOrder = 'Order'; -$lang->project->PRJSort = 'Order'; -$lang->project->PRJWhitelist = 'Project Whitelist'; -$lang->project->PRJAddWhitelist = 'Project Add Whitelist'; -$lang->project->unbindWhielist = 'Project Remove Whitelist'; -$lang->project->PRJManageProducts = 'Manage Products'; -$lang->project->view = 'Program Detail'; -$lang->project->copyTitle = 'Please select an project to copy'; -$lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.'; -$lang->project->errorNoProducts = 'At least one product is associated'; -$lang->project->copyNoProject = 'There are no items available to copy.'; -$lang->project->searchByName = 'Enter the project name to retrieve'; +$lang->project->createGuide = 'Select Template'; +$lang->project->index = 'Dashboard'; +$lang->project->home = 'Home'; +$lang->project->create = 'Create Project'; +$lang->project->edit = 'Edit'; +$lang->project->batchEdit = 'Batch Edit Projects'; +$lang->project->view = 'Project View'; +$lang->project->batchEdit = 'Batch Edit'; +$lang->project->browse = 'Projects'; +$lang->project->all = 'All'; +$lang->project->start = 'Start'; +$lang->project->finish = 'Finish'; +$lang->project->suspend = 'Suspend'; +$lang->project->delete = 'Delete'; +$lang->project->close = 'Close'; +$lang->project->activate = 'Activate'; +$lang->project->group = 'Privilege Group'; +$lang->project->createGroup = 'Create Group'; +$lang->project->editGroup = 'Edit Group'; +$lang->project->copyGroup = 'Copy Group'; +$lang->project->manageView = 'Manage View'; +$lang->project->managePriv = 'Manage Privilege'; +$lang->project->manageMembers = 'Manage Team'; +$lang->project->export = 'Export'; +$lang->project->addProduct = 'Add Product'; +$lang->project->manageGroupMember = 'Manage Group'; +$lang->project->moduleSetting = 'List Settings'; +$lang->project->moduleOpen = 'Program Name'; +$lang->project->updateOrder = 'Order'; +$lang->project->sort = 'Order'; +$lang->project->whitelist = 'Project Whitelist'; +$lang->project->addWhitelist = 'Project Add Whitelist'; +$lang->project->unbindWhielist = 'Project Remove Whitelist'; +$lang->project->manageProducts = 'Manage Products'; +$lang->project->copyTitle = 'Please select an project to copy'; +$lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.'; +$lang->project->errorNoProducts = 'At least one product is associated'; +$lang->project->copyNoProject = 'There are no items available to copy.'; +$lang->project->searchByName = 'Enter the project name to retrieve'; /* Fields. */ -$lang->project->common = 'Program'; -$lang->project->project = 'Project'; +$lang->project->common = 'Project'; $lang->project->stage = 'Stage'; $lang->project->PM = 'Manager'; -$lang->project->PRJName = 'Name'; -$lang->project->PRJCategory = 'Category'; -$lang->project->PRJDesc = 'Description'; -$lang->project->PRJCode = 'Code'; -$lang->project->PRJCopy = 'Copy'; +$lang->project->name = 'Name'; +$lang->project->category = 'Category'; +$lang->project->desc = 'Description'; +$lang->project->code = 'Code'; +$lang->project->copy = 'Copy'; $lang->project->begin = 'Begin'; $lang->project->end = 'End'; -$lang->project->PRJStatus = 'Status'; -$lang->project->PRJPM = 'Manager'; -$lang->project->PRJBudget = 'Budget'; -$lang->project->PRJTemplate = 'Template'; -$lang->project->PRJEstimate = 'Estimates'; -$lang->project->PRJConsume = 'Cost'; -$lang->project->PRJSurplus = 'Left'; -$lang->project->PRJProgress = 'Progress'; +$lang->project->status = 'Status'; +$lang->project->PM = 'Manager'; +$lang->project->budget = 'Budget'; +$lang->project->template = 'Template'; +$lang->project->estimate = 'Estimates'; +$lang->project->consume = 'Cost'; +$lang->project->surplus = 'Left'; +$lang->project->progress = 'Progress'; $lang->project->dateRange = 'Duration'; $lang->project->to = ' to '; $lang->project->realEnd = 'Actual End'; @@ -68,6 +66,9 @@ $lang->project->realBegan = 'Actual Began'; $lang->project->bygrid = 'Kanban'; $lang->project->bylist = 'List'; $lang->project->mine = 'My'; +$lang->project->myProject = 'Mine: '; +$lang->project->other = 'Others: '; +$lang->project->acl = 'Access control'; $lang->project->setPlanduration = 'Set Duration'; $lang->project->auth = 'Access Control'; $lang->project->durationEstimation = 'Estimated Workload'; @@ -75,10 +76,11 @@ $lang->project->teamCount = 'Man'; $lang->project->leftStories = 'Left Stories'; $lang->project->leftTasks = 'Left Tasks'; $lang->project->leftBugs = 'Left Bugs'; -$lang->project->PRJChildren = 'Child Project'; -$lang->project->PRJParent = 'Parent Project'; +$lang->project->children = 'Child Project'; +$lang->project->parent = 'Parent Project'; $lang->project->allStories = 'All Stories'; $lang->project->doneStories = 'Finished Stories'; +$lang->project->doneProjects = 'Finished'; $lang->project->allInput = 'Total Input'; $lang->project->weekly = 'Program Weekly'; $lang->project->pv = 'PV'; @@ -86,10 +88,10 @@ $lang->project->ev = 'EV'; $lang->project->sv = 'SV%'; $lang->project->ac = 'AC'; $lang->project->cv = 'CV%'; -$lang->project->PRJTeamCount = 'Team'; -$lang->project->PRJLongTime = 'Long-Term Project'; +$lang->project->teamCount = 'Team'; +$lang->project->longTime = 'Long-Term Project'; $lang->project->future = 'TBD'; -$lang->project->morePRJ = 'More Projects'; +$lang->project->moreProject = 'More Project'; $lang->project->productNotEmpty = 'Please link products or create products.'; $lang->project->existProductName = 'Product name already exists.'; @@ -139,35 +141,20 @@ $lang->project->currencySymbol['SGD'] = 'S$'; $lang->project->modelList['scrum'] = "Scrum"; $lang->project->modelList['waterfall'] = "CMMI"; -$lang->project->PRJCategoryList['single'] = "Single product"; -$lang->project->PRJCategoryList['multiple'] = "Multiple products"; - -$lang->project->PRJLifeTimeList['short'] = "Short-Term"; -$lang->project->PRJLifeTimeList['long'] = "Long-Term"; -$lang->project->PRJLifeTimeList['ops'] = "DevOps"; - $lang->project->featureBar['all'] = 'All'; $lang->project->featureBar['doing'] = 'Going'; $lang->project->featureBar['wait'] = 'Waiting'; $lang->project->featureBar['suspended'] = 'Suspended'; $lang->project->featureBar['closed'] = 'Closed'; -$lang->project->PRJAclList['private'] = 'Private (For team members and stakeholders only)'; -$lang->project->PRJAclList['open'] = "Open (accessible with project view permissions)"; +$lang->project->aclList['private'] = 'Private (For team members and stakeholders only)'; +$lang->project->aclList['open'] = "Open (accessible with project view permissions)"; -$lang->project->PRJAcls['private'] = 'Private'; -$lang->project->PRJAcls['open'] = "Open"; +$lang->project->acls['private'] = 'Private'; +$lang->project->acls['open'] = "Open"; -$lang->project->PGMPRJAclList['private'] = "Private (For team members and stakeholders only)"; -$lang->project->PGMPRJAclList['project'] = "Public within the project set (accessible to all higher-level project set leaders and stakeholders, members of this project team and stakeholders)"; -$lang->project->PGMPRJAclList['open'] = "Full disclosure (accessible with project view permissions)"; - -$lang->project->PGMPRJAcls['private'] = "Private"; -$lang->project->PGMPRJAcls['project'] = "Public within the project set"; -$lang->project->PGMPRJAcls['open'] = "Full disclosure"; - -$lang->project->PRJAuthList['extend'] = 'Inherit (system privilege and project privilege)'; -$lang->project->PRJAuthList['reset'] = 'Reset (project privilege only)'; +$lang->project->authList['extend'] = 'Inherit (system privilege and project privilege)'; +$lang->project->authList['reset'] = 'Reset (project privilege only)'; $lang->project->statusList['wait'] = 'Waiting'; $lang->project->statusList['doing'] = 'Doing'; @@ -180,7 +167,7 @@ $lang->project->endList[186] = 'Half yearly'; $lang->project->endList[365] = 'One year'; $lang->project->endList[999] = 'Longtime'; -$lang->project->noPRJ = 'No project.'; +$lang->project->empry = 'No project.'; $lang->project->accessDenied = 'Access denied!'; $lang->project->chooseProgramType = 'Select the project management model'; $lang->project->nextStep = 'Next step'; @@ -190,7 +177,7 @@ $lang->project->lastIteration = 'Recent iterations'; $lang->project->ongoingStage = 'Ongoing stage'; $lang->project->scrum = 'Scrum'; $lang->project->waterfall = 'CMMI'; -$lang->project->waterfallTitle = 'CMMI'; +$lang->project->waterfall = 'CMMI'; $lang->project->cannotCreateChild = 'It is not empty, so you cannot add a child. You can add a parent for it, and then create a child.'; $lang->project->hasChildren = 'It has child projects or projects. You cannot delete it.'; $lang->project->confirmDelete = "Do you want to delete [%s]?"; @@ -206,89 +193,18 @@ $lang->project->PRJProgramTitle['0'] = 'Hide'; $lang->project->PRJProgramTitle['base'] = 'Base-level project only'; $lang->project->PRJProgramTitle['end'] = 'End-level project only'; -$lang->project->PRJAccessDenied = 'Access denied to this project'; -$lang->project->PRJChooseProgramType = 'Select management type'; -$lang->project->scrumTitle = 'Agile Development Management'; -$lang->project->PRJCannotCreateChild = 'The project has contents, so you cannot add a child project. You can create a parent project for this one and then add a child project for the parent project.'; -$lang->project->PRJHasChildren = 'This project has a child project, so it cannot be deleted.'; -$lang->project->PRJConfirmDelete = 'Do you want to delete this project?'; -$lang->project->PRJCannotChangeToCat = "The project has contents, so you cannot it to a parent project."; -$lang->project->PRJCannotCancelCat = "There are child projects of this project. You cannot cancel the parent project mark."; -$lang->project->PRJParentBeginEnd = "The begin and end date of the parent project: %s ~ %s"; -$lang->project->PRJParentBudget = "The budget of the parent project: %s"; -$lang->project->PRJBeginLetterParent = "The begin date of the parent project: %s. It cannot be < the begin date of its parent project."; -$lang->project->PRJEndGreaterParent = "The end date of the parent project: %s. It cannot be > the end date of its parent project."; -$lang->project->PRJBeginGreateChild = "The minimum start date of the project set: %s. The start date of the project cannot be less than the minimum start date of the project set."; -$lang->project->PRJEndLetterChild = "The maximum finish date for the project set: %s. The completion date of a project cannot be greater than the maximum completion date of the project set."; -$lang->project->PRJChildLongTime = "There are long-term projects in the child project, and the parent project should also be a long-term project."; - -/* Actions. */ -$lang->project->PGMCommon = 'Program'; -$lang->project->PGMIndex = 'Home'; -$lang->project->PGMCreate = 'Create Program'; -$lang->project->PGMCreateGuide = 'Select Template'; -$lang->project->PGMEdit = 'Edit Program'; -$lang->project->PGMBrowse = 'Programs'; -$lang->project->PGMProduct = 'Products'; -$lang->project->PGMProject = 'Program Project List'; -$lang->project->PGMAll = 'All Programs'; -$lang->project->PGMStart = 'Start'; -$lang->project->PGMFinish = 'Finish'; -$lang->project->PGMSuspend = 'Suspend'; -$lang->project->PGMDelete = 'Delete'; -$lang->project->PGMClose = 'Close'; -$lang->project->PGMActivate = 'Activate'; -$lang->project->PGMExport = 'Export'; -$lang->project->PGMStakeholder = 'Stakeholder'; -$lang->project->createStakeholder = 'Create Stakeholder'; -$lang->project->unlinkStakeholder = 'Unlink Stakeholder'; -$lang->project->batchUnlinkStakeholders = 'Batch Remove Stakeholder'; -$lang->project->unlink = 'Unlink'; -$lang->project->morePGM = 'More Programs'; -$lang->project->confirmBatchUnlink = "Do you want to batch unlink these stakeholders?"; -$lang->project->stakeholderType = 'Stakeholder type'; -$lang->project->isStakeholderKey = 'Key stakeholder'; -$lang->project->importStakeholder = 'Import project'; -$lang->project->PGMManageMembers = 'Program Team'; -$lang->project->PGMParentBudget = 'Parent project surplus budget：'; -$lang->project->beyondParentBudget = 'The remaining budget of the owned project has been exceeded.'; -$lang->project->PGMBeginLetterParent = "Parent begin date: %s, begin date should be > = parent begin date."; -$lang->project->PGMEndGreaterParent = "Parent end date: %s, end date should be < = parent end date."; -$lang->project->PGMBeginGreateChild = "Child earliest begin: %s, parent begin date < = child earliest begin date."; -$lang->project->PGMEndLetterChild = "Child latest end: %s, parent end date > = child latest end date."; -$lang->project->PGMCloseErrorMessage = 'There are subprojects or projects that are not closed'; - -$lang->project->stakeholderTypeList['inside'] = 'Inside'; -$lang->project->stakeholderTypeList['outside'] = 'Outside'; - -/* Fields. */ -$lang->project->PGMName = 'Name'; -$lang->project->PGMTemplate = 'Template'; -$lang->project->PGMCategory = 'Type'; -$lang->project->PGMDesc = 'Description'; -$lang->project->PGMCopy = 'Copy Program'; -$lang->project->PGMStatus = 'Status'; -$lang->project->PGMPM = 'Manager'; -$lang->project->PGMBudget = 'Budget'; -$lang->project->PGMProgress = 'Progress'; -$lang->project->PGMChildren = 'Child'; -$lang->project->PGMParent = 'Parent'; -$lang->project->PGMAllInput = 'Input'; -$lang->project->PGMTeamCount = 'Team'; -$lang->project->PGMLongTime = 'Long-Term'; - -$lang->project->noPGM = 'No project.'; -$lang->project->PGMShowClosed = 'Closed projects.'; -$lang->project->PGMTips = 'If a parent item set is selected, products under that parent item set can be associated. If no item set is selected, a product with the same name as the item is created by default and associated with that item.'; - -$lang->project->PGMAclList['private'] = "Private (accessible to project portfolio holders and stakeholders, stakeholders can follow up maintenance)"; -$lang->project->PGMAclList['open'] = "Default(user who can visit the project can access it)"; - -$lang->project->subPGMAclList['private'] = "Private (accessible to this project set leader and stakeholders, stakeholders can follow up maintenance)"; -$lang->project->subPGMAclList['open'] = "Default(user who can visit the project can access it)"; -$lang->project->subPGMAclList['project'] = "Open within the project (accessible to all higher-level project directors and affiliates, as well as to this project director and affiliates)"; - -$lang->project->PGMAuthList['extend'] = 'Inherit(project privileges and company privileges)'; -$lang->project->PGMAuthList['reset'] = 'Reset(project privileges only)'; - -$lang->project->PGMFeatureBar['all'] = 'All'; +$lang->project->accessDenied = 'Access denied to this project'; +$lang->project->chooseProgramType = 'Select management type'; +$lang->project->umTitle = 'Agile Development Management'; +$lang->project->cannotCreateChild = 'The project has contents, so you cannot add a child project. You can create a parent project for this one and then add a child project for the parent project.'; +$lang->project->hasChildren = 'This project has a child project, so it cannot be deleted.'; +$lang->project->confirmDelete = 'Do you want to delete this project?'; +$lang->project->cannotChangeToCat = "The project has contents, so you cannot it to a parent project."; +$lang->project->cannotCancelCat = "There are child projects of this project. You cannot cancel the parent project mark."; +$lang->project->parentBeginEnd = "The begin and end date of the parent project: %s ~ %s"; +$lang->project->parentBudget = "The budget of the parent project: %s"; +$lang->project->beginLetterParent = "The begin date of the parent project: %s. It cannot be < the begin date of its parent project."; +$lang->project->endGreaterParent = "The end date of the parent project: %s. It cannot be > the end date of its parent project."; +$lang->project->beginGreateChild = "The minimum start date of the project set: %s. The start date of the project cannot be less than the minimum start date of the project set."; +$lang->project->endLetterChild = "The maximum finish date for the project set: %s. The completion date of a project cannot be greater than the maximum completion date of the project set."; +$lang->project->childLongTime = "There are long-term projects in the child project, and the parent project should also be a long-term project."; diff --git a/module/project/lang/vi.php b/module/project/lang/vi.php index ba47a0f202..d5505973dc 100644 --- a/module/project/lang/vi.php +++ b/module/project/lang/vi.php @@ -1,66 +1,64 @@ project->createGuide = 'Select Template'; -$lang->project->PRJIndex = 'Dashboard'; -$lang->project->PRJHome = 'Home'; -$lang->project->PRJCreate = 'Create Project'; -$lang->project->PRJEdit = 'Edit'; -$lang->project->PRJBatchEdit = 'Batch Edit Projects'; -$lang->project->PRJView = 'Project View'; -$lang->project->batchEdit = 'Batch Edit'; -$lang->project->PRJBrowse = 'Projects'; -$lang->project->PRJAll = 'All'; -$lang->project->PRJStart = 'Start'; -$lang->project->PRJFinish = 'Finish'; -$lang->project->PRJSuspend = 'Suspend'; -$lang->project->PRJDelete = 'Delete'; -$lang->project->PRJClose = 'Close'; -$lang->project->PRJActivate = 'Activate'; -$lang->project->PRJGroup = 'Privilege Group'; -$lang->project->PRJCreateGroup = 'Create Group'; -$lang->project->PRJEditGroup = 'Edit Group'; -$lang->project->PRJCopyGroup = 'Copy Group'; -$lang->project->PRJManageView = 'Manage View'; -$lang->project->PRJManagePriv = 'Manage Privilege'; -$lang->project->PRJManageMembers = 'Manage Team'; -$lang->project->export = 'Export'; -$lang->project->addProduct = 'Add product'; -$lang->project->PRJManageGroupMember = 'Manage Group'; -$lang->project->PRJModuleSetting = 'List Settings'; -$lang->project->PRJModuleOpen = 'Program Name'; -$lang->project->PRJUpdateOrder = 'Order'; -$lang->project->PRJSort = 'Order'; -$lang->project->PRJWhitelist = 'Project Whitelist'; -$lang->project->PRJAddWhitelist = 'Project Add Whitelist'; -$lang->project->unbindWhielist = 'Project Remove Whitelist'; -$lang->project->PRJManageProducts = 'Manage Products'; -$lang->project->view = 'Program Detail'; -$lang->project->copyTitle = 'Please select an project to copy'; -$lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.'; -$lang->project->errorNoProducts = 'At least one product is associated'; -$lang->project->copyNoProject = 'There are no items available to copy.'; -$lang->project->searchByName = 'Enter the project name to retrieve'; +$lang->project->createGuide = 'Select Template'; +$lang->project->index = 'Dashboard'; +$lang->project->home = 'Home'; +$lang->project->create = 'Create Project'; +$lang->project->edit = 'Edit'; +$lang->project->batchEdit = 'Batch Edit Projects'; +$lang->project->view = 'Project View'; +$lang->project->batchEdit = 'Batch Edit'; +$lang->project->browse = 'Projects'; +$lang->project->all = 'All'; +$lang->project->start = 'Start'; +$lang->project->finish = 'Finish'; +$lang->project->suspend = 'Suspend'; +$lang->project->delete = 'Delete'; +$lang->project->close = 'Close'; +$lang->project->activate = 'Activate'; +$lang->project->group = 'Privilege Group'; +$lang->project->createGroup = 'Create Group'; +$lang->project->editGroup = 'Edit Group'; +$lang->project->copyGroup = 'Copy Group'; +$lang->project->manageView = 'Manage View'; +$lang->project->managePriv = 'Manage Privilege'; +$lang->project->manageMembers = 'Manage Team'; +$lang->project->export = 'Export'; +$lang->project->addProduct = 'Add Product'; +$lang->project->manageGroupMember = 'Manage Group'; +$lang->project->moduleSetting = 'List Settings'; +$lang->project->moduleOpen = 'Program Name'; +$lang->project->updateOrder = 'Order'; +$lang->project->sort = 'Order'; +$lang->project->whitelist = 'Project Whitelist'; +$lang->project->addWhitelist = 'Project Add Whitelist'; +$lang->project->unbindWhielist = 'Project Remove Whitelist'; +$lang->project->manageProducts = 'Manage Products'; +$lang->project->copyTitle = 'Please select an project to copy'; +$lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.'; +$lang->project->errorNoProducts = 'At least one product is associated'; +$lang->project->copyNoProject = 'There are no items available to copy.'; +$lang->project->searchByName = 'Enter the project name to retrieve'; /* Fields. */ -$lang->project->common = 'Program'; -$lang->project->project = 'Project'; +$lang->project->common = 'Project'; $lang->project->stage = 'Stage'; $lang->project->PM = 'Manager'; -$lang->project->PRJName = 'Name'; -$lang->project->PRJCategory = 'Category'; -$lang->project->PRJDesc = 'Description'; -$lang->project->PRJCode = 'Code'; -$lang->project->PRJCopy = 'Copy'; +$lang->project->name = 'Name'; +$lang->project->category = 'Category'; +$lang->project->desc = 'Description'; +$lang->project->code = 'Code'; +$lang->project->copy = 'Copy'; $lang->project->begin = 'Begin'; $lang->project->end = 'End'; -$lang->project->PRJStatus = 'Status'; -$lang->project->PRJPM = 'Manager'; -$lang->project->PRJBudget = 'Budget'; -$lang->project->PRJTemplate = 'Template'; -$lang->project->PRJEstimate = 'Estimates'; -$lang->project->PRJConsume = 'Cost'; -$lang->project->PRJSurplus = 'Left'; -$lang->project->PRJProgress = 'Progress'; +$lang->project->status = 'Status'; +$lang->project->PM = 'Manager'; +$lang->project->budget = 'Budget'; +$lang->project->template = 'Template'; +$lang->project->estimate = 'Estimates'; +$lang->project->consume = 'Cost'; +$lang->project->surplus = 'Left'; +$lang->project->progress = 'Progress'; $lang->project->dateRange = 'Duration'; $lang->project->to = ' to '; $lang->project->realEnd = 'Actual End'; @@ -68,6 +66,9 @@ $lang->project->realBegan = 'Actual Began'; $lang->project->bygrid = 'Kanban'; $lang->project->bylist = 'List'; $lang->project->mine = 'My'; +$lang->project->myProject = 'Mine: '; +$lang->project->other = 'Others: '; +$lang->project->acl = 'Access control'; $lang->project->setPlanduration = 'Set Duration'; $lang->project->auth = 'Access Control'; $lang->project->durationEstimation = 'Estimated Workload'; @@ -75,10 +76,11 @@ $lang->project->teamCount = 'Man'; $lang->project->leftStories = 'Left Stories'; $lang->project->leftTasks = 'Left Tasks'; $lang->project->leftBugs = 'Left Bugs'; -$lang->project->PRJChildren = 'Child Project'; -$lang->project->PRJParent = 'Parent Project'; +$lang->project->children = 'Child Project'; +$lang->project->parent = 'Parent Project'; $lang->project->allStories = 'All Stories'; $lang->project->doneStories = 'Finished Stories'; +$lang->project->doneProjects = 'Finished'; $lang->project->allInput = 'Total Input'; $lang->project->weekly = 'Program Weekly'; $lang->project->pv = 'PV'; @@ -86,10 +88,10 @@ $lang->project->ev = 'EV'; $lang->project->sv = 'SV%'; $lang->project->ac = 'AC'; $lang->project->cv = 'CV%'; -$lang->project->PRJTeamCount = 'Team'; -$lang->project->PRJLongTime = 'Long-Term Project'; +$lang->project->teamCount = 'Team'; +$lang->project->longTime = 'Long-Term Project'; $lang->project->future = 'TBD'; -$lang->project->morePRJ = 'More Projects'; +$lang->project->moreProject = 'More Project'; $lang->project->productNotEmpty = 'Please link products or create products.'; $lang->project->existProductName = 'Product name already exists.'; @@ -139,35 +141,20 @@ $lang->project->currencySymbol['SGD'] = 'S$'; $lang->project->modelList['scrum'] = "Scrum"; $lang->project->modelList['waterfall'] = "CMMI"; -$lang->project->PRJCategoryList['single'] = "Single product"; -$lang->project->PRJCategoryList['multiple'] = "Multiple products"; - -$lang->project->PRJLifeTimeList['short'] = "Short-Term"; -$lang->project->PRJLifeTimeList['long'] = "Long-Term"; -$lang->project->PRJLifeTimeList['ops'] = "DevOps"; - $lang->project->featureBar['all'] = 'All'; $lang->project->featureBar['doing'] = 'Going'; $lang->project->featureBar['wait'] = 'Waiting'; $lang->project->featureBar['suspended'] = 'Suspended'; $lang->project->featureBar['closed'] = 'Closed'; -$lang->project->PRJAclList['private'] = 'Private (For team members and stakeholders only)'; -$lang->project->PRJAclList['open'] = "Open (accessible with project view permissions)"; +$lang->project->aclList['private'] = 'Private (For team members and stakeholders only)'; +$lang->project->aclList['open'] = "Open (accessible with project view permissions)"; -$lang->project->PRJAcls['private'] = 'Private'; -$lang->project->PRJAcls['open'] = "Open"; +$lang->project->acls['private'] = 'Private'; +$lang->project->acls['open'] = "Open"; -$lang->project->PGMPRJAclList['private'] = "Private (For team members and stakeholders only)"; -$lang->project->PGMPRJAclList['project'] = "Public within the project set (accessible to all higher-level project set leaders and stakeholders, members of this project team and stakeholders)"; -$lang->project->PGMPRJAclList['open'] = "Full disclosure (accessible with project view permissions)"; - -$lang->project->PGMPRJAcls['private'] = "Private"; -$lang->project->PGMPRJAcls['project'] = "Public within the project set"; -$lang->project->PGMPRJAcls['open'] = "Full disclosure"; - -$lang->project->PRJAuthList['extend'] = 'Inherit (system privilege and project privilege)'; -$lang->project->PRJAuthList['reset'] = 'Reset (project privilege only)'; +$lang->project->authList['extend'] = 'Inherit (system privilege and project privilege)'; +$lang->project->authList['reset'] = 'Reset (project privilege only)'; $lang->project->statusList['wait'] = 'Waiting'; $lang->project->statusList['doing'] = 'Doing'; @@ -180,7 +167,7 @@ $lang->project->endList[186] = 'Half yearly'; $lang->project->endList[365] = 'One year'; $lang->project->endList[999] = 'Longtime'; -$lang->project->noPRJ = 'No project.'; +$lang->project->empty = 'No project.'; $lang->project->accessDenied = 'Access denied!'; $lang->project->chooseProgramType = 'Select the project management model'; $lang->project->nextStep = 'Next step'; @@ -202,93 +189,22 @@ $lang->project->childLongTime = "If a child as long-term projects, the $lang->project->readjustTime = 'Change the project begin&end date.'; $lang->project->notAllowRemoveProducts = 'The story of this product is linked with the project. Unlink it before doing any action.'; -$lang->project->PRJProgramTitle['0'] = 'Hide'; -$lang->project->PRJProgramTitle['base'] = 'Base-level project only'; -$lang->project->PRJProgramTitle['end'] = 'End-level project only'; +$lang->project->programTitle['0'] = 'Hide'; +$lang->project->programTitle['base'] = 'Base-level project only'; +$lang->project->programTitle['end'] = 'End-level project only'; -$lang->project->PRJAccessDenied = 'Access denied to this project'; -$lang->project->PRJChooseProgramType = 'Select management type'; -$lang->project->scrumTitle = 'Agile Development Management'; -$lang->project->PRJCannotCreateChild = 'The project has contents, so you cannot add a child project. You can create a parent project for this one and then add a child project for the parent project.'; -$lang->project->PRJHasChildren = 'This project has a child project, so it cannot be deleted.'; -$lang->project->PRJConfirmDelete = 'Do you want to delete this project?'; -$lang->project->PRJCannotChangeToCat = "The project has contents, so you cannot it to a parent project."; -$lang->project->PRJCannotCancelCat = "There are child projects of this project. You cannot cancel the parent project mark."; -$lang->project->PRJParentBeginEnd = "The begin and end date of the parent project: %s ~ %s"; -$lang->project->PRJParentBudget = "The budget of the parent project: %s"; -$lang->project->PRJBeginLetterParent = "The begin date of the parent project: %s. It cannot be < the begin date of its parent project."; -$lang->project->PRJEndGreaterParent = "The end date of the parent project: %s. It cannot be > the end date of its parent project."; -$lang->project->PRJBeginGreateChild = "The minimum start date of the project set: %s. The start date of the project cannot be less than the minimum start date of the project set."; -$lang->project->PRJEndLetterChild = "The maximum finish date for the project set: %s. The completion date of a project cannot be greater than the maximum completion date of the project set."; -$lang->project->PRJChildLongTime = "There are long-term projects in the child project, and the parent project should also be a long-term project."; - -/* Actions. */ -$lang->project->PGMCommon = 'Program'; -$lang->project->PGMIndex = 'Home'; -$lang->project->PGMCreate = 'Create Program'; -$lang->project->PGMCreateGuide = 'Select Template'; -$lang->project->PGMEdit = 'Edit Program'; -$lang->project->PGMBrowse = 'Programs'; -$lang->project->PGMProduct = 'Products'; -$lang->project->PGMProject = 'Program Project List'; -$lang->project->PGMAll = 'All Programs'; -$lang->project->PGMStart = 'Start'; -$lang->project->PGMFinish = 'Finish'; -$lang->project->PGMSuspend = 'Suspend'; -$lang->project->PGMDelete = 'Delete'; -$lang->project->PGMClose = 'Close'; -$lang->project->PGMActivate = 'Activate'; -$lang->project->PGMExport = 'Export'; -$lang->project->PGMStakeholder = 'Stakeholder'; -$lang->project->createStakeholder = 'Create Stakeholder'; -$lang->project->unlinkStakeholder = 'Unlink Stakeholder'; -$lang->project->batchUnlinkStakeholders = 'Batch Remove Stakeholder'; -$lang->project->unlink = 'Unlink'; -$lang->project->morePGM = 'More Programs'; -$lang->project->confirmBatchUnlink = "Do you want to batch unlink these stakeholders?"; -$lang->project->stakeholderType = 'Stakeholder type'; -$lang->project->isStakeholderKey = 'Key stakeholder'; -$lang->project->importStakeholder = 'Import project'; -$lang->project->PGMManageMembers = 'Program Team'; -$lang->project->PGMParentBudget = 'Parent project surplus budget：'; -$lang->project->beyondParentBudget = 'The remaining budget of the owned project has been exceeded.'; -$lang->project->PGMBeginLetterParent = "Parent begin date: %s, begin date should be > = parent begin date."; -$lang->project->PGMEndGreaterParent = "Parent end date: %s, end date should be < = parent end date."; -$lang->project->PGMBeginGreateChild = "Child earliest begin: %s, parent begin date < = child earliest begin date."; -$lang->project->PGMEndLetterChild = "Child latest end: %s, parent end date > = child latest end date."; -$lang->project->PGMCloseErrorMessage = 'There are subprojects or projects that are not closed'; - -$lang->project->stakeholderTypeList['inside'] = 'Inside'; -$lang->project->stakeholderTypeList['outside'] = 'Outside'; - -/* Fields. */ -$lang->project->PGMName = 'Name'; -$lang->project->PGMTemplate = 'Template'; -$lang->project->PGMCategory = 'Type'; -$lang->project->PGMDesc = 'Description'; -$lang->project->PGMCopy = 'Copy Program'; -$lang->project->PGMStatus = 'Status'; -$lang->project->PGMPM = 'Manager'; -$lang->project->PGMBudget = 'Budget'; -$lang->project->PGMProgress = 'Progress'; -$lang->project->PGMChildren = 'Child'; -$lang->project->PGMParent = 'Parent'; -$lang->project->PGMAllInput = 'Input'; -$lang->project->PGMTeamCount = 'Team'; -$lang->project->PGMLongTime = 'Long-Term'; - -$lang->project->noPGM = 'No project.'; -$lang->project->PGMShowClosed = 'Closed projects.'; -$lang->project->PGMTips = 'If a parent item set is selected, products under that parent item set can be associated. If no item set is selected, a product with the same name as the item is created by default and associated with that item.'; - -$lang->project->PGMAclList['private'] = "Private (accessible to project portfolio holders and stakeholders, stakeholders can follow up maintenance)"; -$lang->project->PGMAclList['open'] = "Default(user who can visit the project can access it)"; - -$lang->project->subPGMAclList['private'] = "Private (accessible to this project set leader and stakeholders, stakeholders can follow up maintenance)"; -$lang->project->subPGMAclList['open'] = "Default(user who can visit the project can access it)"; -$lang->project->subPGMAclList['project'] = "Open within the project (accessible to all higher-level project directors and affiliates, as well as to this project director and affiliates)"; - -$lang->project->PGMAuthList['extend'] = 'Inherit(project privileges and company privileges)'; -$lang->project->PGMAuthList['reset'] = 'Reset(project privileges only)'; - -$lang->project->PGMFeatureBar['all'] = 'All'; +$lang->project->accessDenied = 'Access denied to this project'; +$lang->project->chooseProgramType = 'Select management type'; +$lang->project->scrumTitle = 'Agile Development Management'; +$lang->project->cannotCreateChild = 'The project has contents, so you cannot add a child project. You can create a parent project for this one and then add a child project for the parent project.'; +$lang->project->hasChildren = 'This project has a child project, so it cannot be deleted.'; +$lang->project->confirmDelete = 'Do you want to delete this project?'; +$lang->project->cannotChangeToCat = "The project has contents, so you cannot it to a parent project."; +$lang->project->cannotCancelCat = "There are child projects of this project. You cannot cancel the parent project mark."; +$lang->project->parentBeginEnd = "The begin and end date of the parent project: %s ~ %s"; +$lang->project->parentBudget = "The budget of the parent project: %s"; +$lang->project->beginLetterParent = "The begin date of the parent project: %s. It cannot be < the begin date of its parent project."; +$lang->project->endGreaterParent = "The end date of the parent project: %s. It cannot be > the end date of its parent project."; +$lang->project->beginGreateChild = "The minimum start date of the project set: %s. The start date of the project cannot be less than the minimum start date of the project set."; +$lang->project->endLetterChild = "The maximum finish date for the project set: %s. The completion date of a project cannot be greater than the maximum completion date of the project set."; +$lang->project->childLongTime = "There are long-term projects in the child project, and the parent project should also be a long-term project."; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 6b03c772db..52da443a89 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -66,6 +66,8 @@ $lang->project->realBegan = '实际开始日期'; $lang->project->bygrid = '看板'; $lang->project->bylist = '列表'; $lang->project->mine = '我参与的'; +$lang->project->myProject = '我负责：'; +$lang->project->other = '其他：'; $lang->project->acl = '访问控制'; $lang->project->setPlanduration = '设置工期'; $lang->project->auth = '权限控制'; @@ -78,6 +80,7 @@ $lang->project->children = '子项目'; $lang->project->parent = '父项目'; $lang->project->allStories = '总需求'; $lang->project->doneStories = '已完成'; +$lang->project->doneProjects = '已结束'; $lang->project->allInput = '项目总投入'; $lang->project->weekly = '项目周报'; $lang->project->pv = 'PV'; diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php index e2a4bb1d06..733d4b8db0 100644 --- a/module/project/view/ajaxgetdropmenu.html.php +++ b/module/project/view/ajaxgetdropmenu.html.php @@ -1,57 +1,63 @@ +status != 'done' and $project->status != 'closed' and $project->PM == $this->app->user->account) $iCharges++; + if($project->status != 'done' and $project->status != 'closed' and !($project->PM == $this->app->user->account)) $others++; + if($project->status == 'done' or $project->status == 'closed') $dones++; + $projectNames[] = $project->name; +} +$projectsPinYin = common::convert2Pinyin($projectNames); + +foreach($projects as $project) +{ + $projectName = $project->parent ? zget($programs, $project->parent, '') . '/' . $project->name : $project->name; + if($project->status != 'done' and $project->status != 'closed' and $project->PM == $this->app->user->account) + { + $myProjectsHtml .= html::a(sprintf($link, $project->id), $projectName, '', "class='text-important' title='{$projectName}' data-key='" . zget($projectsPinYin, $projectName, '') . "'"); + } + else if($project->status != 'done' and $project->status != 'closed' and !($project->PM == $this->app->user->account)) + { + $normalProjectsHtml .= html::a(sprintf($link, $project->id), $projectName, '', "title='{$projectName}' data-key='" . zget($projectsPinYin, $projectName, '') . "'"); + } + else if($project->status == 'done' or $project->status == 'closed') $closedProjectsHtml .= html::a(sprintf($link, $project->id), $projectName, '', "title='{$projectName}' data-key='" . zget($projectsPinYin, $projectName, '') . "'"); +} +?>
- + {$lang->project->myProject}
"; + echo $myProjectsHtml; + if(!empty($myProjectsHtml)) + { + echo "
{$lang->project->other}
"; + } + } + echo $normalProjectsHtml; + ?>
- ' . $lang->project->all, '', 'class="not-list-item"'); ?> - execution->doneProjects;?> + ' . $lang->project->all, '', 'class="not-list-item"'); ?> + project->doneProjects?>
-
- +
+
- - From 1b42cb6ff6ce01697f453a7f888bcde8aa96b5b7 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 9 Mar 2021 16:12:28 +0800 Subject: [PATCH 03/11] * Merge code. --- module/common/lang/de.php | 19 +++++++------------ module/common/lang/en.php | 19 +++++++------------ module/common/lang/fr.php | 19 +++++++------------ module/common/lang/vi.php | 19 +++++++------------ module/common/lang/zh-cn.php | 23 ++++++++++++----------- module/common/model.php | 6 ------ module/stakeholder/control.php | 3 ++- 7 files changed, 42 insertions(+), 66 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 621cefcf24..8f95d4b7d1 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -896,20 +896,16 @@ $lang->menu->scrum->ci = 'Code|repo|browse'; $lang->menu->scrum->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}'); $lang->menu->scrum->projectrelease = array('link' => 'Release|projectrelease|browse'); $lang->menu->scrum->dynamic = array('link' => 'Dynamic|project|dynamic|project={PROJECT}'); -$lang->menu->scrum->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder'); $lang->menu->scrum->projectsetting = array('link' => 'Setting|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist'); $lang->scrum = new stdclass(); -$lang->scrum->subMenu = new stdclass(); -$lang->scrum->subMenu->other = new stdclass(); -$lang->scrum->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); - $lang->scrum->setMenu = new stdclass(); -$lang->scrum->setMenu->view = array('link' => 'View|project|view|project={PROJECT}'); -$lang->scrum->setMenu->products = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); -$lang->scrum->setMenu->members = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); -$lang->scrum->setMenu->group = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); -$lang->scrum->setMenu->whitelist = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->view = array('link' => 'View|project|view|project={PROJECT}'); +$lang->scrum->setMenu->products = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); +$lang->scrum->setMenu->members = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); +$lang->scrum->setMenu->whitelist = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); +$lang->scrum->setMenu->group = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); /* Waterfall menu. */ $lang->menu->waterfall = new stdclass(); @@ -961,8 +957,7 @@ $lang->stakeholder->menu = new stdclass(); $lang->waterfallproduct->menu = new stdclass(); $lang->projectstory->menu = new stdclass(); -$lang->stakeholder->menu->list = array('link' => 'Stakeholder List|stakeholder|browse|', 'alias' => 'create,edit,view,batchcreate'); -$lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|'); +$lang->stakeholder->menu = $lang->scrum->setMenu; $lang->nc->menu = $lang->auditplan->menu; $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage'); diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 7f13345058..acd0fd49c7 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -895,20 +895,16 @@ $lang->menu->scrum->ci = 'Code|repo|browse'; $lang->menu->scrum->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}'); $lang->menu->scrum->projectrelease = array('link' => 'Release|projectrelease|browse'); $lang->menu->scrum->dynamic = array('link' => 'Dynamic|project|dynamic|project={PROJECT}'); -$lang->menu->scrum->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder'); $lang->menu->scrum->projectsetting = array('link' => 'Setting|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist'); $lang->scrum = new stdclass(); -$lang->scrum->subMenu = new stdclass(); -$lang->scrum->subMenu->other = new stdclass(); -$lang->scrum->subMenu->other->stakeholder = array('link' => '干系人|stakeholder|browse|', 'subModule' => 'stakeholder'); - $lang->scrum->setMenu = new stdclass(); -$lang->scrum->setMenu->view = array('link' => 'View|project|view|project={PROJECT}'); -$lang->scrum->setMenu->products = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); -$lang->scrum->setMenu->members = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); -$lang->scrum->setMenu->group = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); -$lang->scrum->setMenu->whitelist = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->view = array('link' => 'View|project|view|project={PROJECT}'); +$lang->scrum->setMenu->products = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); +$lang->scrum->setMenu->members = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); +$lang->scrum->setMenu->whitelist = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->stakeholder = array('link' => '干系人|stakeholder|browse|', 'subModule' => 'stakeholder'); +$lang->scrum->setMenu->group = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); /* Waterfall menu. */ $lang->menu->waterfall = new stdclass(); @@ -960,8 +956,7 @@ $lang->stakeholder->menu = new stdclass(); $lang->waterfallproduct->menu = new stdclass(); $lang->projectstory->menu = new stdclass(); -$lang->stakeholder->menu->list = array('link' => 'Stakeholder List|stakeholder|browse|', 'alias' => 'create,edit,view,batchcreate'); -$lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|'); +$lang->stakeholder->menu = $lang->scrum->setMenu; $lang->nc->menu = $lang->auditplan->menu; $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage'); diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 1a6c6dd0d4..930f2a06d4 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -895,20 +895,16 @@ $lang->menu->scrum->ci = 'Code|repo|browse'; $lang->menu->scrum->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}'); $lang->menu->scrum->projectrelease = array('link' => 'Release|projectrelease|browse'); $lang->menu->scrum->dynamic = array('link' => 'Dynamic|project|dynamic|project={PROJECT}'); -$lang->menu->scrum->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder'); $lang->menu->scrum->projectsetting = array('link' => 'Setting|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist'); $lang->scrum = new stdclass(); -$lang->scrum->subMenu = new stdclass(); -$lang->scrum->subMenu->other = new stdclass(); -$lang->scrum->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); - $lang->scrum->setMenu = new stdclass(); -$lang->scrum->setMenu->view = array('link' => 'View|project|view|project={PROJECT}'); -$lang->scrum->setMenu->products = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); -$lang->scrum->setMenu->members = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); -$lang->scrum->setMenu->group = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); -$lang->scrum->setMenu->whitelist = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->view = array('link' => 'View|project|view|project={PROJECT}'); +$lang->scrum->setMenu->products = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); +$lang->scrum->setMenu->members = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); +$lang->scrum->setMenu->whitelist = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); +$lang->scrum->setMenu->group = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); /* Waterfall menu. */ $lang->menu->waterfall = new stdclass(); @@ -960,8 +956,7 @@ $lang->stakeholder->menu = new stdclass(); $lang->waterfallproduct->menu = new stdclass(); $lang->projectstory->menu = new stdclass(); -$lang->stakeholder->menu->list = array('link' => 'Stakeholder List|stakeholder|browse|', 'alias' => 'create,edit,view,batchcreate'); -$lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|'); +$lang->stakeholder->menu = $lang->scrum->setMenu; $lang->nc->menu = $lang->auditplan->menu; $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage'); diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index ab43c7303a..581daef645 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -895,20 +895,16 @@ $lang->menu->scrum->ci = 'Code|repo|browse'; $lang->menu->scrum->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}'); $lang->menu->scrum->projectrelease = array('link' => 'Release|projectrelease|browse'); $lang->menu->scrum->dynamic = array('link' => 'Dynamic|project|dynamic|project={PROJECT}'); -$lang->menu->scrum->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder'); $lang->menu->scrum->projectsetting = array('link' => 'Setting|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist'); $lang->scrum = new stdclass(); -$lang->scrum->subMenu = new stdclass(); -$lang->scrum->subMenu->other = new stdclass(); -$lang->scrum->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); - $lang->scrum->setMenu = new stdclass(); -$lang->scrum->setMenu->view = array('link' => 'View|project|view|project={PROJECT}'); -$lang->scrum->setMenu->products = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); -$lang->scrum->setMenu->members = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); -$lang->scrum->setMenu->group = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); -$lang->scrum->setMenu->whitelist = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->view = array('link' => 'View|project|view|project={PROJECT}'); +$lang->scrum->setMenu->products = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); +$lang->scrum->setMenu->members = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); +$lang->scrum->setMenu->whitelist = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->subMenu->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); +$lang->scrum->setMenu->group = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); /* Waterfall menu. */ $lang->menu->waterfall = new stdclass(); @@ -960,8 +956,7 @@ $lang->stakeholder->menu = new stdclass(); $lang->waterfallproduct->menu = new stdclass(); $lang->projectstory->menu = new stdclass(); -$lang->stakeholder->menu->list = array('link' => 'Stakeholder List|stakeholder|browse|', 'alias' => 'create,edit,view,batchcreate'); -$lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|'); +$lang->stakeholder->menu = $lang->scrum->setMenu; $lang->nc->menu = $lang->auditplan->menu; $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage'); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index e61a79c33a..ee0f821f7b 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -895,22 +895,24 @@ $lang->menu->scrum->doc = '文档|doc|index|'; $lang->menu->scrum->qa = '测试|qa|index'; $lang->menu->scrum->ci = '代码|repo|browse'; $lang->menu->scrum->projectbuild = array('link' => '版本|projectbuild|browse|project={PROJECT}'); +<<<<<<< c02b5e3b4a6a00c7456d91ff8c19d01fd47cd664 $lang->menu->scrum->projectrelease = array('link' => '发布|projectrelease|browse|project={PROJECT}'); $lang->menu->scrum->dynamic = array('link' => '动态|project|dynamic'); $lang->menu->scrum->other = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder'); $lang->menu->scrum->projectsetting = array('link' => '设置|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist'); +======= +$lang->menu->scrum->projectrelease = array('link' => '发布|projectrelease|browse'); +$lang->menu->scrum->projectsetting = array('link' => '设置|project|view|project={PROJECT}', 'subModule' => 'stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist'); +>>>>>>> * Finish task #36444. $lang->scrum = new stdclass(); -$lang->scrum->subMenu = new stdclass(); -$lang->scrum->subMenu->other = new stdclass(); -$lang->scrum->subMenu->other->stakeholder = array('link' => '干系人|stakeholder|browse|', 'subModule' => 'stakeholder'); - $lang->scrum->setMenu = new stdclass(); -$lang->scrum->setMenu->view = array('link' => '概况|project|view|project={PROJECT}', 'alias' => 'edit'); -$lang->scrum->setMenu->products = array('link' => '产品|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); -$lang->scrum->setMenu->members = array('link' => '团队|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); -$lang->scrum->setMenu->group = array('link' => '权限|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); -$lang->scrum->setMenu->whitelist = array('link' => '白名单|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->view = array('link' => '概况|project|view|project={PROJECT}', 'alias' => 'edit'); +$lang->scrum->setMenu->products = array('link' => '产品|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); +$lang->scrum->setMenu->members = array('link' => '团队|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); +$lang->scrum->setMenu->whitelist = array('link' => '白名单|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->stakeholder = array('link' => '干系人|stakeholder|browse|', 'subModule' => 'stakeholder'); +$lang->scrum->setMenu->group = array('link' => '权限|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); /* Waterfall menu. */ $lang->menu->waterfall = new stdclass(); @@ -962,8 +964,7 @@ $lang->stakeholder->menu = new stdclass(); $lang->waterfallproduct->menu = new stdclass(); $lang->projectstory->menu = new stdclass(); -$lang->stakeholder->menu->list = array('link' => '干系人列表|stakeholder|browse|', 'alias' => 'create,edit,view,batchcreate'); -$lang->stakeholder->menu->issue = array('link' => '问题管理|stakeholder|issue|'); +$lang->stakeholder->menu = $lang->scrum->setMenu; $lang->nc->menu = $lang->auditplan->menu; $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage'); diff --git a/module/common/model.php b/module/common/model.php index 0707a34015..42982aff7f 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -711,9 +711,6 @@ class commonModel extends model $subMenu = ""; } - /* Disable links to more buttons. */ - if($menuItem->name == 'other') $link = 'javascript:void(0);'; - /* Avoid highlighting the same navigation method at the same time. */ if($currentModule == 'feedback' and $currentMethod == 'admin') $active = ''; if($currentModule == 'product' and $currentMethod == 'browse') $active = ''; @@ -1761,9 +1758,6 @@ EOD; $module = strtolower($module); $method = strtolower($method); - /* More menus do not require permission control. */ - if($module == 'project' && $method == 'other') return true; - /* Check the parent object is closed. */ if(!empty($method) and strpos('close|batchclose', $method) === false and !commonModel::canBeChanged($module, $object)) return false; diff --git a/module/stakeholder/control.php b/module/stakeholder/control.php index 617b724f5f..ecbca2aee2 100644 --- a/module/stakeholder/control.php +++ b/module/stakeholder/control.php @@ -105,6 +105,7 @@ class stakeholder extends control $this->loadModel('user'); $this->loadModel('dept'); + $this->loadModel('execution'); $deptUsers = $dept === '' ? array() : $this->dept->getDeptUserPairs($dept); $this->view->title = $this->lang->stakeholder->batchCreate; @@ -117,7 +118,7 @@ class stakeholder extends control $this->view->projectID = $this->session->PRJ; $this->view->depts = array('' => '') + $this->dept->getOptionMenu(); $this->view->stakeholders = $this->stakeholder->getStakeholders('all', 'id_desc'); - $this->view->parentStakeholders = $this->program->getStakeholders($parentID, 't1.id_desc'); + $this->view->parentStakeholders = $this->loadModel('program')->getStakeholders($parentID, 't1.id_desc'); $this->display(); } From 2abdf31ad8006ea17c0c1ec106a05c3c90baabd2 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 9 Mar 2021 16:14:41 +0800 Subject: [PATCH 04/11] * Fix lang bug. --- module/common/lang/zh-cn.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index ee0f821f7b..6bd9371abf 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -895,13 +895,8 @@ $lang->menu->scrum->doc = '文档|doc|index|'; $lang->menu->scrum->qa = '测试|qa|index'; $lang->menu->scrum->ci = '代码|repo|browse'; $lang->menu->scrum->projectbuild = array('link' => '版本|projectbuild|browse|project={PROJECT}'); -<<<<<<< c02b5e3b4a6a00c7456d91ff8c19d01fd47cd664 $lang->menu->scrum->projectrelease = array('link' => '发布|projectrelease|browse|project={PROJECT}'); $lang->menu->scrum->dynamic = array('link' => '动态|project|dynamic'); -$lang->menu->scrum->other = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder'); -$lang->menu->scrum->projectsetting = array('link' => '设置|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist'); -======= -$lang->menu->scrum->projectrelease = array('link' => '发布|projectrelease|browse'); $lang->menu->scrum->projectsetting = array('link' => '设置|project|view|project={PROJECT}', 'subModule' => 'stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist'); >>>>>>> * Finish task #36444. From 01419f2c94990a87f0273c704901de3231bf928a Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 9 Mar 2021 16:15:03 +0800 Subject: [PATCH 05/11] * Fix lang bug. --- module/common/lang/zh-cn.php | 1 - 1 file changed, 1 deletion(-) diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 6bd9371abf..e62a9a5675 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -898,7 +898,6 @@ $lang->menu->scrum->projectbuild = array('link' => '版本|projectbuild|browse $lang->menu->scrum->projectrelease = array('link' => '发布|projectrelease|browse|project={PROJECT}'); $lang->menu->scrum->dynamic = array('link' => '动态|project|dynamic'); $lang->menu->scrum->projectsetting = array('link' => '设置|project|view|project={PROJECT}', 'subModule' => 'stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist'); ->>>>>>> * Finish task #36444. $lang->scrum = new stdclass(); $lang->scrum->setMenu = new stdclass(); From 074bce86fd1192151f671631a6c83f6064ac1931 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 9 Mar 2021 16:55:09 +0800 Subject: [PATCH 06/11] * Finish task #36459. --- module/project/control.php | 3 +- module/project/css/browse.css | 10 ++++--- .../project/css/{prjcreate.css => create.css} | 0 module/project/css/{prjedit.css => edit.css} | 0 ...jmanageproducts.css => manageproducts.css} | 0 module/project/css/pgmbrowse.css | 3 -- module/project/css/pgmcreate.css | 11 ------- module/project/css/pgmedit.css | 2 -- module/project/css/pgmproduct.css | 3 -- module/project/css/prjbrowse.css | 6 ---- module/project/css/{prjview.css => view.css} | 0 module/project/view/ajaxgetdropmenu.html.php | 1 + module/project/view/managemembers.html.php | 4 +-- module/project/view/view.html.php | 30 +++++++++---------- 14 files changed, 25 insertions(+), 48 deletions(-) rename module/project/css/{prjcreate.css => create.css} (100%) rename module/project/css/{prjedit.css => edit.css} (100%) rename module/project/css/{prjmanageproducts.css => manageproducts.css} (100%) delete mode 100644 module/project/css/pgmbrowse.css delete mode 100644 module/project/css/pgmcreate.css delete mode 100644 module/project/css/pgmedit.css delete mode 100644 module/project/css/pgmproduct.css delete mode 100644 module/project/css/prjbrowse.css rename module/project/css/{prjview.css => view.css} (100%) diff --git a/module/project/control.php b/module/project/control.php index 1dba141403..36d6b31d06 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -117,12 +117,11 @@ class project extends control { $projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->in($this->app->user->view->projects)->andWhere('deleted')->eq(0)->orderBy('parent desc')->fetchAll(); - $this->view->link = helper::createLink('project', 'index', "projectID=%s"); $this->view->projectID = $projectID; $this->view->projects = $projects; $this->view->module = $module; $this->view->method = $method; - $this->view->programs = $this->loadModel('program')->getpairs(true); + $this->view->programs = $this->loadModel('program')->getPairs(true); $this->display(); } diff --git a/module/project/css/browse.css b/module/project/css/browse.css index 162a500957..d1b8aa8238 100644 --- a/module/project/css/browse.css +++ b/module/project/css/browse.css @@ -1,4 +1,6 @@ -#mainMenu .pull-left .checkbox-primary {display: inline-block; margin-left: 10px;} -#mainMenu .pull-right > .btn-group + .btn {margin-left: 10px;} -#mainMenu .pull-right > .btn-group > .btn-icon {background: transparent;} -#mainMenu .pull-right > .btn-group > .btn-icon:hover {background: #fff;} +.side-col .detail-content{padding-left: 10px; margin-top: 0px} +.side-col {padding-right: 20px; width: 18%} +#sidebar>.cell {width: 100%;} + +td.c-actions{overflow: visible} +.c-actions .btn{overflow: visible} diff --git a/module/project/css/prjcreate.css b/module/project/css/create.css similarity index 100% rename from module/project/css/prjcreate.css rename to module/project/css/create.css diff --git a/module/project/css/prjedit.css b/module/project/css/edit.css similarity index 100% rename from module/project/css/prjedit.css rename to module/project/css/edit.css diff --git a/module/project/css/prjmanageproducts.css b/module/project/css/manageproducts.css similarity index 100% rename from module/project/css/prjmanageproducts.css rename to module/project/css/manageproducts.css diff --git a/module/project/css/pgmbrowse.css b/module/project/css/pgmbrowse.css deleted file mode 100644 index 3b1a7d7f3d..0000000000 --- a/module/project/css/pgmbrowse.css +++ /dev/null @@ -1,3 +0,0 @@ -#mainMenu .pull-left .checkbox-primary {display: inline-block; margin-left: 10px;} -.main-table tbody>tr>td:first-child, .main-table thead>tr>th:first-child {padding-left: 8px;} -.table tbody>tr>td .dropdown, .table thead>tr>th .dropdown {display: inline-block; line-height: 1;} diff --git a/module/project/css/pgmcreate.css b/module/project/css/pgmcreate.css deleted file mode 100644 index 04500c0433..0000000000 --- a/module/project/css/pgmcreate.css +++ /dev/null @@ -1,11 +0,0 @@ -#copyProjectModal {padding: 0} -#copyProjectModal {padding: 0 2px} -#copyProjectModal > div {position: relative;} -#copyProjectModal a {display: block; min-height: 30px; line-height: 30px; padding: 5px 15px; border: 1px solid #e5e5e5; color: #333; margin: 5px 0; border-radius: 3px;} -#copyProjectModal a > i {display: inline-block; margin-right: 5px;} -#copyProjectModal a:hover {border:1px solid #00a9fc; background-color: #E9F2FB; text-decoration: none} -#copyProjectModal a.active {border-color: #00da88; color: #00da88; background-color: #E5FFE6} -#copyProjectModal a.active:after {position: absolute; content: '\e92f'; font-family: ZentaoIcon; font-size: 20px; right: 25px;} -#copyProjectModal a.cancel {color: #ff5d5d} -#budget {border-right: 0px;} -#budgetUnit {border-left: 0px;} diff --git a/module/project/css/pgmedit.css b/module/project/css/pgmedit.css deleted file mode 100644 index 191b12ce1d..0000000000 --- a/module/project/css/pgmedit.css +++ /dev/null @@ -1,2 +0,0 @@ -#budget {border-right: 0px;} -#budgetUnit {border-left: 0px;} diff --git a/module/project/css/pgmproduct.css b/module/project/css/pgmproduct.css deleted file mode 100644 index 34e5493a41..0000000000 --- a/module/project/css/pgmproduct.css +++ /dev/null @@ -1,3 +0,0 @@ -.main-table thead>tr:first-of-type>th {border-left: 1px solid #ddd;} -.main-table thead>tr>th {padding: 0px 8px; line-height: 24px;} -tbody.sortable > tr > td > span.sort-handler {color: #999;} diff --git a/module/project/css/prjbrowse.css b/module/project/css/prjbrowse.css deleted file mode 100644 index d1b8aa8238..0000000000 --- a/module/project/css/prjbrowse.css +++ /dev/null @@ -1,6 +0,0 @@ -.side-col .detail-content{padding-left: 10px; margin-top: 0px} -.side-col {padding-right: 20px; width: 18%} -#sidebar>.cell {width: 100%;} - -td.c-actions{overflow: visible} -.c-actions .btn{overflow: visible} diff --git a/module/project/css/prjview.css b/module/project/css/view.css similarity index 100% rename from module/project/css/prjview.css rename to module/project/css/view.css diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php index 733d4b8db0..de7693255a 100644 --- a/module/project/view/ajaxgetdropmenu.html.php +++ b/module/project/view/ajaxgetdropmenu.html.php @@ -20,6 +20,7 @@ $projectsPinYin = common::convert2Pinyin($projectNames); foreach($projects as $project) { + $link = helper::createLink('project', 'index', "projectID=%s", '', '', $project->id); $projectName = $project->parent ? zget($programs, $project->parent, '') . '/' . $project->name : $project->name; if($project->status != 'done' and $project->status != 'closed' and $project->PM == $this->app->user->account) { diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php index 87c49266b5..8fd1a51807 100644 --- a/module/project/view/managemembers.html.php +++ b/module/project/view/managemembers.html.php @@ -7,8 +7,8 @@ createLink('project', 'prjmanagemembers', "projectID={$project->id}"), " {$lang->project->manageMembers}");?>
- project->selectDept?> - project->selectDeptTitle}'");?> + execution->selectDept?> + execution->selectDeptTitle}'");?>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index febcd6aca1..2b339855c3 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -18,7 +18,7 @@
-
project->latestDynamic;?>
+
execution->latestDynamic;?>
@@ -40,7 +40,7 @@
-
project->relatedMember;?>
+
execution->relatedMember;?>
@@ -122,7 +122,7 @@ deleted):?> project->deleted;?> - project->lifeTimeList, $project->lifetime);?> + execution->lifeTimeList, $project->lifetime);?> delay)):?> project->delayed;?> @@ -148,7 +148,7 @@
-
project->linkPlan;?>
+
execution->linkPlan;?>
$product):?> @@ -160,7 +160,7 @@
-
project->lblStats;?>
+
execution->lblStats;?>
@@ -177,31 +177,31 @@ - - + + - - + + - + - - + + - - + +
project->begin;?> begin;?>project->totalEstimate;?>totalEstimate . $lang->project->workHour;?>execution->totalEstimate;?>totalEstimate . $lang->execution->workHour;?>
project->end;?> end;?>project->totalConsumed;?>totalConsumed . $lang->project->workHour;?>execution->totalConsumed;?>totalConsumed . $lang->execution->workHour;?>
project->totalDays;?>execution->totalDays;?> days;?>project->totalLeft;?>totalLeft . $lang->project->workHour;?>execution->totalLeft;?>totalLeft . $lang->execution->workHour;?>
project->totalHours;?>totalHours . $lang->project->workHour;?>execution->totalHours;?>totalHours . $lang->execution->workHour;?>
-
project->basicInfo;?>
+
execution->basicInfo;?>
From a295e11e63d6533084f274372be311d2e73d3944 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Tue, 9 Mar 2021 16:56:46 +0800 Subject: [PATCH 07/11] * Finish task#36499. --- module/common/lang/menuOrder.php | 25 ++++++++++++------------- module/common/lang/zh-cn.php | 31 +++++++++++++++++-------------- module/execution/control.php | 4 ++-- module/execution/model.php | 2 ++ 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php index 7e19c96181..9c4dc357d6 100644 --- a/module/common/lang/menuOrder.php +++ b/module/common/lang/menuOrder.php @@ -82,19 +82,18 @@ $lang->release->menuOrder = $lang->product->menuOrder; $lang->branch->menuOrder = $lang->product->menuOrder; /* project menu order. */ -$lang->execution->menuOrder[5] = 'index'; -$lang->execution->menuOrder[10] = 'task'; -$lang->execution->menuOrder[15] = 'kanban'; -$lang->execution->menuOrder[20] = 'burn'; -$lang->execution->menuOrder[25] = 'view'; -$lang->execution->menuOrder[30] = 'story'; -$lang->execution->menuOrder[35] = 'bug'; -$lang->execution->menuOrder[40] = 'build'; -$lang->execution->menuOrder[45] = 'testtask'; -$lang->execution->menuOrder[50] = 'doc'; -$lang->execution->menuOrder[55] = 'product'; -$lang->execution->menuOrder[60] = 'team'; -$lang->execution->menuOrder[65] = 'more'; +$lang->execution->menuOrder[5] = 'task'; +$lang->execution->menuOrder[10] = 'kanban'; +$lang->execution->menuOrder[15] = 'burn'; +$lang->execution->menuOrder[20] = 'view'; +$lang->execution->menuOrder[25] = 'story'; +$lang->execution->menuOrder[30] = 'bug'; +$lang->execution->menuOrder[35] = 'build'; +$lang->execution->menuOrder[40] = 'testtask'; +$lang->execution->menuOrder[45] = 'doc'; +$lang->execution->menuOrder[50] = 'product'; +$lang->execution->menuOrder[55] = 'team'; +$lang->execution->menuOrder[60] = 'more'; $lang->task->menuOrder = $lang->execution->menuOrder; $lang->build->menuOrder = $lang->execution->menuOrder; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index e62a9a5675..b171b7050c 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -338,19 +338,22 @@ $lang->story->menu = $lang->product->menu; /* 执行视图菜单设置。*/ $lang->execution = new stdclass(); $lang->execution->menu = new stdclass(); -$lang->execution->menu->index = '仪表盘|execution|index|'; -$lang->execution->menu->task = array('link' => '任务|execution|task|executionID=%s', 'subModule' => 'task,tree', 'alias' => 'importtask,importbug'); -$lang->execution->menu->kanban = array('link' => '看板|execution|kanban|executionID=%s'); -$lang->execution->menu->burn = array('link' => '燃尽图|execution|burn|executionID=%s'); -$lang->execution->menu->view = array('link' => '视图|execution|grouptask|executionID=%s', 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover'); -$lang->execution->menu->story = array('link' => "{$lang->SRCommon}|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); -$lang->execution->menu->bug = array('link' => 'Bug|execution|bug|executionID=%s'); -$lang->execution->menu->build = array('link' => '版本|execution|build|executionID=%s', 'subModule' => 'build'); -$lang->execution->menu->testtask = array('link' => '测试单|execution|testtask|executionID=%s', 'subModule' => 'testreport,testtask'); -$lang->execution->menu->doc = array('link' => '文档|doc|objectLibs|type=execution&objectID=%s&from=execution', 'subModule' => 'doc'); -$lang->execution->menu->product = $lang->productCommon . '|execution|manageproducts|executionID=%s'; -$lang->execution->menu->team = array('link' => '团队|execution|team|executionID=%s', 'alias' => 'managemembers'); -$lang->execution->menu->more = array('link' => '更多|execution|whitelist|executionID=%s', 'subModule' => 'personnel', 'alias' => 'edit', 'class' => 'dropdown dropdown-hover'); +$lang->execution->menu->index = '仪表盘|execution|index|'; +$lang->execution->menu->list = '执行|execution|all|'; + +$lang->execution->viewMenu = new stdclass(); +$lang->execution->viewMenu->task = array('link' => '任务|execution|task|executionID=%s', 'subModule' => 'task,tree', 'alias' => 'importtask,importbug'); +$lang->execution->viewMenu->kanban = array('link' => '看板|execution|kanban|executionID=%s'); +$lang->execution->viewMenu->burn = array('link' => '燃尽图|execution|burn|executionID=%s'); +$lang->execution->viewMenu->view = array('link' => '视图|execution|grouptask|executionID=%s', 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover'); +$lang->execution->viewMenu->story = array('link' => "{$lang->SRCommon}|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); +$lang->execution->viewMenu->bug = array('link' => 'Bug|execution|bug|executionID=%s'); +$lang->execution->viewMenu->build = array('link' => '版本|execution|build|executionID=%s', 'subModule' => 'build'); +$lang->execution->viewMenu->testtask = array('link' => '测试单|execution|testtask|executionID=%s', 'subModule' => 'testreport,testtask'); +$lang->execution->viewMenu->doc = array('link' => '文档|doc|objectLibs|type=execution&objectID=%s&from=execution', 'subModule' => 'doc'); +$lang->execution->viewMenu->product = $lang->productCommon . '|execution|manageproducts|executionID=%s'; +$lang->execution->viewMenu->team = array('link' => '团队|execution|team|executionID=%s', 'alias' => 'managemembers'); +$lang->execution->viewMenu->more = array('link' => '更多|execution|whitelist|executionID=%s', 'subModule' => 'personnel', 'alias' => 'edit', 'class' => 'dropdown dropdown-hover'); $lang->execution->subMenu = new stdclass(); $lang->execution->subMenu->view = new stdclass(); @@ -367,7 +370,7 @@ $lang->execution->subMenu->more->whitelist = array('link' => '白名单|executio $lang->execution->subMenu->more->action = array('link' => '动态|execution|dynamic|executionID=%s'); $lang->execution->subMenu->more->view = array('link' => '概况|execution|view|executionID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close'); -$lang->execution->dividerMenu = ',task,story,doc,'; +$lang->execution->dividerMenu = ',story,doc,'; $lang->task = new stdclass(); $lang->build = new stdclass(); diff --git a/module/execution/control.php b/module/execution/control.php index e550a7c07a..218b446514 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -110,8 +110,8 @@ class execution extends control $this->view->executions = $this->executions; $this->view->execution = $execution; $this->view->childExecutions = $childExecutions; - $this->view->products = $products; - $this->view->teamMembers = $teamMembers; + $this->view->products = $products; + $this->view->teamMembers = $teamMembers; return $execution; } diff --git a/module/execution/model.php b/module/execution/model.php index b362e1e459..09e9b27e2f 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -62,6 +62,8 @@ class executionModel extends model */ public function setMenu($executions, $executionID, $buildID = 0, $extra = '') { + if($this->app->rawMethod != 'index' and $this->app->rawMethod != 'all') $this->lang->execution->menu = $this->lang->execution->viewMenu; + if(empty($executions)) { $project = $this->loadModel('project')->getByID($this->session->PRJ); From a94f6b2ee98db34e8bf0658d07544fd0e6c5bf43 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Tue, 9 Mar 2021 17:16:53 +0800 Subject: [PATCH 08/11] * Adjust block module language item. --- module/block/lang/de.php | 305 ++++++++++++++++++----------------- module/block/lang/en.php | 297 +++++++++++++++++----------------- module/block/lang/fr.php | 307 +++++++++++++++++------------------ module/block/lang/vi.php | 309 ++++++++++++++++++------------------ module/block/lang/zh-cn.php | 44 +---- module/block/lang/zh-tw.php | 307 +++++++++++++++++------------------ 6 files changed, 780 insertions(+), 789 deletions(-) diff --git a/module/block/lang/de.php b/module/block/lang/de.php index 03298190b7..5c39927ddb 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -42,7 +42,7 @@ $lang->block->leftToday = 'Arbeit für Heute'; $lang->block->myTask = 'Aufgaben'; $lang->block->myStory = 'Story'; $lang->block->myBug = 'Bugs'; -$lang->block->myProject = 'Unclosed ' . $lang->executionCommon . 's'; +$lang->block->myExecution = 'Unclosed ' . $lang->executionCommon . 's'; $lang->block->myProduct = 'Unclosed ' . $lang->productCommon . 's'; $lang->block->delayed = 'Verspätet'; $lang->block->noData = 'Keine Daten für diesen Bericht.'; @@ -98,71 +98,71 @@ $lang->block->spent = 'Has Been Spent'; $lang->block->budget = 'Budget'; $lang->block->left = 'Residuals'; -$lang->block->default['waterfall']['program']['1']['title'] = $lang->executionCommon . 'Weekly'; -$lang->block->default['waterfall']['program']['1']['block'] = 'waterfallreport'; -$lang->block->default['waterfall']['program']['1']['source'] = 'program'; -$lang->block->default['waterfall']['program']['1']['grid'] = 8; +$lang->block->default['waterfall']['project']['1']['title'] = 'Project Weekly'; +$lang->block->default['waterfall']['project']['1']['block'] = 'waterfallreport'; +$lang->block->default['waterfall']['project']['1']['source'] = 'project'; +$lang->block->default['waterfall']['project']['1']['grid'] = 8; -$lang->block->default['waterfall']['program']['2']['title'] = 'Estimate'; -$lang->block->default['waterfall']['program']['2']['block'] = 'waterfallestimate'; -$lang->block->default['waterfall']['program']['2']['source'] = 'program'; -$lang->block->default['waterfall']['program']['2']['grid'] = 4; +$lang->block->default['waterfall']['project']['2']['title'] = 'Estimate'; +$lang->block->default['waterfall']['project']['2']['block'] = 'waterfallestimate'; +$lang->block->default['waterfall']['project']['2']['source'] = 'project'; +$lang->block->default['waterfall']['project']['2']['grid'] = 4; -$lang->block->default['waterfall']['program']['3']['title'] = 'Plan Gantt Chart'; -$lang->block->default['waterfall']['program']['3']['block'] = 'waterfallgantt'; -$lang->block->default['waterfall']['program']['3']['source'] = 'program'; -$lang->block->default['waterfall']['program']['3']['grid'] = 8; +$lang->block->default['waterfall']['project']['3']['title'] = 'Plan Gantt Chart'; +$lang->block->default['waterfall']['project']['3']['block'] = 'waterfallgantt'; +$lang->block->default['waterfall']['project']['3']['source'] = 'project'; +$lang->block->default['waterfall']['project']['3']['grid'] = 8; -$lang->block->default['waterfall']['program']['4']['title'] = 'Progress Chart'; -$lang->block->default['waterfall']['program']['4']['block'] = 'waterfallprogress'; -$lang->block->default['waterfall']['program']['4']['grid'] = 4; +$lang->block->default['waterfall']['project']['4']['title'] = 'Progress Chart'; +$lang->block->default['waterfall']['project']['4']['block'] = 'waterfallprogress'; +$lang->block->default['waterfall']['project']['4']['grid'] = 4; -$lang->block->default['waterfall']['program']['5']['title'] = 'project Issue'; -$lang->block->default['waterfall']['program']['5']['block'] = 'waterfallissue'; -$lang->block->default['waterfall']['program']['5']['source'] = 'program'; -$lang->block->default['waterfall']['program']['5']['grid'] = 8; +$lang->block->default['waterfall']['project']['5']['title'] = 'Project Issue'; +$lang->block->default['waterfall']['project']['5']['block'] = 'waterfallissue'; +$lang->block->default['waterfall']['project']['5']['source'] = 'project'; +$lang->block->default['waterfall']['project']['5']['grid'] = 8; -$lang->block->default['waterfall']['program']['5']['params']['type'] = 'all'; -$lang->block->default['waterfall']['program']['5']['params']['count'] = '15'; -$lang->block->default['waterfall']['program']['5']['params']['orderBy'] = 'id_desc'; +$lang->block->default['waterfall']['project']['5']['params']['type'] = 'all'; +$lang->block->default['waterfall']['project']['5']['params']['count'] = '15'; +$lang->block->default['waterfall']['project']['5']['params']['orderBy'] = 'id_desc'; -$lang->block->default['waterfall']['program']['6']['title'] = 'Dynamic'; -$lang->block->default['waterfall']['program']['6']['block'] = 'projectdynamic'; -$lang->block->default['waterfall']['program']['6']['grid'] = 4; -$lang->block->default['waterfall']['program']['6']['source'] = 'program'; +$lang->block->default['waterfall']['project']['6']['title'] = 'Dynamic'; +$lang->block->default['waterfall']['project']['6']['block'] = 'projectdynamic'; +$lang->block->default['waterfall']['project']['6']['grid'] = 4; +$lang->block->default['waterfall']['project']['6']['source'] = 'project'; -$lang->block->default['waterfall']['program']['7']['title'] = 'Project Risk'; -$lang->block->default['waterfall']['program']['7']['block'] = 'waterfallrisk'; -$lang->block->default['waterfall']['program']['7']['source'] = 'program'; -$lang->block->default['waterfall']['program']['7']['grid'] = 8; +$lang->block->default['waterfall']['project']['7']['title'] = 'Project Risk'; +$lang->block->default['waterfall']['project']['7']['block'] = 'waterfallrisk'; +$lang->block->default['waterfall']['project']['7']['source'] = 'project'; +$lang->block->default['waterfall']['project']['7']['grid'] = 8; -$lang->block->default['waterfall']['program']['7']['params']['type'] = 'all'; -$lang->block->default['waterfall']['program']['7']['params']['count'] = '15'; -$lang->block->default['waterfall']['program']['7']['params']['orderBy'] = 'id_desc'; +$lang->block->default['waterfall']['project']['7']['params']['type'] = 'all'; +$lang->block->default['waterfall']['project']['7']['params']['count'] = '15'; +$lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc'; -$lang->block->default['scrum']['program']['1']['title'] = 'Project Overall'; -$lang->block->default['scrum']['program']['1']['block'] = 'scrumoverview'; -$lang->block->default['scrum']['program']['1']['grid'] = 8; +$lang->block->default['scrum']['project']['1']['title'] = 'Project Overall'; +$lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview'; +$lang->block->default['scrum']['project']['1']['grid'] = 8; -$lang->block->default['scrum']['program']['2']['title'] = $lang->executionCommon . ' List'; -$lang->block->default['scrum']['program']['2']['block'] = 'scrumlist'; -$lang->block->default['scrum']['program']['2']['grid'] = 8; +$lang->block->default['scrum']['project']['2']['title'] = $lang->executionCommon . ' List'; +$lang->block->default['scrum']['project']['2']['block'] = 'scrumlist'; +$lang->block->default['scrum']['project']['2']['grid'] = 8; -$lang->block->default['scrum']['program']['3']['title'] = 'Test Version'; -$lang->block->default['scrum']['program']['3']['block'] = 'scrumtest'; -$lang->block->default['scrum']['program']['3']['grid'] = 8; +$lang->block->default['scrum']['project']['3']['title'] = 'Test Version'; +$lang->block->default['scrum']['project']['3']['block'] = 'scrumtest'; +$lang->block->default['scrum']['project']['3']['grid'] = 8; -$lang->block->default['scrum']['program']['3']['params']['type'] = 'wait'; -$lang->block->default['scrum']['program']['3']['params']['count'] = '15'; -$lang->block->default['scrum']['program']['3']['params']['orderBy'] = 'id_desc'; +$lang->block->default['scrum']['project']['3']['params']['type'] = 'wait'; +$lang->block->default['scrum']['project']['3']['params']['count'] = '15'; +$lang->block->default['scrum']['project']['3']['params']['orderBy'] = 'id_desc'; -$lang->block->default['scrum']['program']['4']['title'] = $lang->executionCommon . ' Overview'; -$lang->block->default['scrum']['program']['4']['block'] = 'sprint'; -$lang->block->default['scrum']['program']['4']['grid'] = 4; +$lang->block->default['scrum']['project']['4']['title'] = $lang->executionCommon . ' Overview'; +$lang->block->default['scrum']['project']['4']['block'] = 'sprint'; +$lang->block->default['scrum']['project']['4']['grid'] = 4; -$lang->block->default['scrum']['program']['5']['title'] = 'Dynamic'; -$lang->block->default['scrum']['program']['5']['block'] = 'projectdynamic'; -$lang->block->default['scrum']['program']['5']['grid'] = 4; +$lang->block->default['scrum']['project']['5']['title'] = 'Dynamic'; +$lang->block->default['scrum']['project']['5']['block'] = 'projectdynamic'; +$lang->block->default['scrum']['project']['5']['grid'] = 4; $lang->block->default['product']['1']['title'] = $lang->productCommon . ' Berichte'; $lang->block->default['product']['1']['block'] = 'statistic'; @@ -190,39 +190,39 @@ $lang->block->default['product']['4']['params']['count'] = 15; $lang->block->default['product']['4']['params']['orderBy'] = 'id_desc'; $lang->block->default['product']['4']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['1']['title'] = $lang->executionCommon . ' Berichte'; -$lang->block->default['project']['1']['block'] = 'statistic'; -$lang->block->default['project']['1']['grid'] = 8; +$lang->block->default['execution']['1']['title'] = 'Execution Berichte'; +$lang->block->default['execution']['1']['block'] = 'statistic'; +$lang->block->default['execution']['1']['grid'] = 8; -$lang->block->default['project']['1']['params']['type'] = 'all'; -$lang->block->default['project']['1']['params']['count'] = '20'; +$lang->block->default['execution']['1']['params']['type'] = 'all'; +$lang->block->default['execution']['1']['params']['count'] = '20'; -$lang->block->default['project']['2']['title'] = $lang->executionCommon . ' Übersicht'; -$lang->block->default['project']['2']['block'] = 'overview'; -$lang->block->default['project']['2']['grid'] = 4; +$lang->block->default['execution']['2']['title'] = 'Execution Übersicht'; +$lang->block->default['execution']['2']['block'] = 'overview'; +$lang->block->default['execution']['2']['grid'] = 4; -$lang->block->default['project']['3']['title'] = 'Aktive ' . $lang->executionCommon . 's'; -$lang->block->default['project']['3']['block'] = 'list'; -$lang->block->default['project']['3']['grid'] = 8; +$lang->block->default['execution']['3']['title'] = 'Aktive Executions'; +$lang->block->default['execution']['3']['block'] = 'list'; +$lang->block->default['execution']['3']['grid'] = 8; -$lang->block->default['project']['3']['params']['count'] = 15; -$lang->block->default['project']['3']['params']['orderBy'] = 'id_desc'; -$lang->block->default['project']['3']['params']['type'] = 'undone'; +$lang->block->default['execution']['3']['params']['count'] = 15; +$lang->block->default['execution']['3']['params']['orderBy'] = 'id_desc'; +$lang->block->default['execution']['3']['params']['type'] = 'undone'; -$lang->block->default['project']['4']['title'] = 'Meine Aufgaben'; -$lang->block->default['project']['4']['block'] = 'task'; -$lang->block->default['project']['4']['grid'] = 4; +$lang->block->default['execution']['4']['title'] = 'Meine Aufgaben'; +$lang->block->default['execution']['4']['block'] = 'task'; +$lang->block->default['execution']['4']['grid'] = 4; -$lang->block->default['project']['4']['params']['count'] = 15; -$lang->block->default['project']['4']['params']['orderBy'] = 'id_desc'; -$lang->block->default['project']['4']['params']['type'] = 'assignedTo'; +$lang->block->default['execution']['4']['params']['count'] = 15; +$lang->block->default['execution']['4']['params']['orderBy'] = 'id_desc'; +$lang->block->default['execution']['4']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['5']['title'] = 'Build List'; -$lang->block->default['project']['5']['block'] = 'build'; -$lang->block->default['project']['5']['grid'] = 8; +$lang->block->default['execution']['5']['title'] = 'Build List'; +$lang->block->default['execution']['5']['block'] = 'build'; +$lang->block->default['execution']['5']['grid'] = 8; -$lang->block->default['project']['5']['params']['count'] = 15; -$lang->block->default['project']['5']['params']['orderBy'] = 'id_desc'; +$lang->block->default['execution']['5']['params']['count'] = 15; +$lang->block->default['execution']['5']['params']['orderBy'] = 'id_desc'; $lang->block->default['qa']['1']['title'] = 'Test Report'; $lang->block->default['qa']['1']['block'] = 'statistic'; @@ -269,15 +269,15 @@ $lang->block->default['full']['my']['2']['block'] = 'dynamic'; $lang->block->default['full']['my']['2']['grid'] = 4; $lang->block->default['full']['my']['2']['source'] = ''; -$lang->block->default['full']['my']['3']['title'] = 'My Todos'; -$lang->block->default['full']['my']['3']['block'] = 'list'; -$lang->block->default['full']['my']['3']['grid'] = 4; -$lang->block->default['full']['my']['3']['source'] = 'todo'; +$lang->block->default['full']['my']['3']['title'] = 'My Todos'; +$lang->block->default['full']['my']['3']['block'] = 'list'; +$lang->block->default['full']['my']['3']['grid'] = 4; +$lang->block->default['full']['my']['3']['source'] = 'todo'; $lang->block->default['full']['my']['3']['params']['count'] = '20'; $lang->block->default['full']['my']['4']['title'] = 'Project Statistic'; $lang->block->default['full']['my']['4']['block'] = 'statistic'; -$lang->block->default['full']['my']['4']['source'] = 'program'; +$lang->block->default['full']['my']['4']['source'] = 'project'; $lang->block->default['full']['my']['4']['grid'] = 8; $lang->block->default['full']['my']['5']['title'] = 'Personal Contribution'; @@ -287,7 +287,7 @@ $lang->block->default['full']['my']['5']['grid'] = 4; $lang->block->default['full']['my']['6']['title'] = 'Recent Project'; $lang->block->default['full']['my']['6']['block'] = 'recentproject'; -$lang->block->default['full']['my']['6']['source'] = 'program'; +$lang->block->default['full']['my']['6']['source'] = 'project'; $lang->block->default['full']['my']['6']['grid'] = 8; $lang->block->default['full']['my']['7']['title'] = 'AssignedToMe'; @@ -303,13 +303,13 @@ $lang->block->default['full']['my']['7']['params']['issueNum'] = '20'; $lang->block->default['full']['my']['7']['params']['storyNum'] = '20'; $lang->block->default['full']['my']['8']['title'] = 'Human Input'; -$lang->block->default['full']['my']['8']['block'] = 'programteam'; -$lang->block->default['full']['my']['8']['source'] = 'program'; +$lang->block->default['full']['my']['8']['block'] = 'projectteam'; +$lang->block->default['full']['my']['8']['source'] = 'project'; $lang->block->default['full']['my']['8']['grid'] = 8; $lang->block->default['full']['my']['9']['title'] = 'Project List'; -$lang->block->default['full']['my']['9']['block'] = 'program'; -$lang->block->default['full']['my']['9']['source'] = 'program'; +$lang->block->default['full']['my']['9']['block'] = 'project'; +$lang->block->default['full']['my']['9']['source'] = 'project'; $lang->block->default['full']['my']['9']['grid'] = 8; $lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc'; @@ -319,34 +319,33 @@ $lang->block->count = 'Count'; $lang->block->type = 'Type'; $lang->block->orderBy = 'Order by'; -$lang->block->availableBlocks = new stdclass(); +$lang->block->availableBlocks = new stdclass(); +$lang->block->availableBlocks->todo = 'Meine Todos'; +$lang->block->availableBlocks->task = 'Meine Aufgaben'; +$lang->block->availableBlocks->bug = 'Meine Bugs'; +$lang->block->availableBlocks->case = 'Meine Fälle'; +$lang->block->availableBlocks->story = 'Meine Story'; +$lang->block->availableBlocks->product = $lang->productCommon . 'Liste'; +$lang->block->availableBlocks->execution = $lang->executionCommon . 'Liste'; +$lang->block->availableBlocks->plan = 'Plan'; +$lang->block->availableBlocks->release = 'Release'; +$lang->block->availableBlocks->build = 'Build'; +$lang->block->availableBlocks->testtask = 'Testaufgaben'; +$lang->block->availableBlocks->risk = 'My Risks'; +$lang->block->availableBlocks->issue = 'My Issues'; -$lang->block->availableBlocks->todo = 'Meine Todos'; -$lang->block->availableBlocks->task = 'Meine Aufgaben'; -$lang->block->availableBlocks->bug = 'Meine Bugs'; -$lang->block->availableBlocks->case = 'Meine Fälle'; -$lang->block->availableBlocks->story = 'Meine Story'; -$lang->block->availableBlocks->product = $lang->productCommon . 'Liste'; -$lang->block->availableBlocks->project = $lang->executionCommon . 'Liste'; -$lang->block->availableBlocks->plan = 'Plan'; -$lang->block->availableBlocks->release = 'Release'; -$lang->block->availableBlocks->build = 'Build'; -$lang->block->availableBlocks->testtask = 'Testaufgaben'; -$lang->block->availableBlocks->risk = 'My Risks'; -$lang->block->availableBlocks->issue = 'My Issues'; +$lang->block->moduleList['project'] = 'Project'; +$lang->block->moduleList['product'] = $lang->productCommon; +$lang->block->moduleList['execution'] = $lang->executionCommon; +$lang->block->moduleList['qa'] = 'QA'; +$lang->block->moduleList['todo'] = 'Todos'; -$lang->block->moduleList['program'] = 'Project'; -$lang->block->moduleList['product'] = $lang->productCommon; -$lang->block->moduleList['project'] = $lang->executionCommon; -$lang->block->moduleList['qa'] = 'QA'; -$lang->block->moduleList['todo'] = 'Todos'; - -$lang->block->modules['program'] = new stdclass(); -$lang->block->modules['program']->availableBlocks = new stdclass(); -$lang->block->modules['program']->availableBlocks->program = 'Project List'; -$lang->block->modules['program']->availableBlocks->recentproject = 'Recent Project'; -$lang->block->modules['program']->availableBlocks->statistic = 'Project Statistic'; -$lang->block->modules['program']->availableBlocks->programteam = 'Project Human Input'; +$lang->block->modules['project'] = new stdclass(); +$lang->block->modules['project']->availableBlocks = new stdclass(); +$lang->block->modules['project']->availableBlocks->project = 'Project List'; +$lang->block->modules['project']->availableBlocks->recentproject = 'Recent Project'; +$lang->block->modules['project']->availableBlocks->statistic = 'Project Statistic'; +$lang->block->modules['project']->availableBlocks->projectteam = 'Project Human Input'; $lang->block->modules['scrum']['index'] = new stdclass(); $lang->block->modules['scrum']['index']->availableBlocks = new stdclass(); @@ -375,13 +374,13 @@ $lang->block->modules['product']->availableBlocks->story = 'Story'; $lang->block->modules['product']->availableBlocks->plan = 'Plan'; $lang->block->modules['product']->availableBlocks->release = 'Release'; -$lang->block->modules['project'] = new stdclass(); -$lang->block->modules['project']->availableBlocks = new stdclass(); -$lang->block->modules['project']->availableBlocks->statistic = $lang->executionCommon . ' Statistik'; -$lang->block->modules['project']->availableBlocks->overview = $lang->executionCommon . ' Übersicht'; -$lang->block->modules['project']->availableBlocks->list = $lang->executionCommon . ' Liste'; -$lang->block->modules['project']->availableBlocks->task = 'Aufgaben'; -$lang->block->modules['project']->availableBlocks->build = 'Build'; +$lang->block->modules['execution'] = new stdclass(); +$lang->block->modules['execution']->availableBlocks = new stdclass(); +$lang->block->modules['execution']->availableBlocks->statistic = $lang->executionCommon . ' Statistik'; +$lang->block->modules['execution']->availableBlocks->overview = $lang->executionCommon . ' Übersicht'; +$lang->block->modules['execution']->availableBlocks->list = $lang->executionCommon . ' Liste'; +$lang->block->modules['execution']->availableBlocks->task = 'Aufgaben'; +$lang->block->modules['execution']->availableBlocks->build = 'Build'; $lang->block->modules['qa'] = new stdclass(); $lang->block->modules['qa']->availableBlocks = new stdclass(); @@ -409,6 +408,12 @@ $lang->block->orderByList->project['id_desc'] = 'ID Absteigend'; $lang->block->orderByList->project['status_asc'] = 'Status Aufsteigend'; $lang->block->orderByList->project['status_desc'] = 'Status Absteigend'; +$lang->block->orderByList->execution = array(); +$lang->block->orderByList->execution['id_asc'] = 'ID Aufsteigend'; +$lang->block->orderByList->execution['id_desc'] = 'ID Absteigend'; +$lang->block->orderByList->execution['status_asc'] = 'Status Aufsteigend'; +$lang->block->orderByList->execution['status_desc'] = 'Status Absteigend'; + $lang->block->orderByList->task = array(); $lang->block->orderByList->task['id_asc'] = 'ID Aufsteigend'; $lang->block->orderByList->task['id_desc'] = 'ID Absteigend'; @@ -478,15 +483,15 @@ $lang->block->typeList->product['closed'] = 'Geschlossen'; $lang->block->typeList->product['all'] = 'Alle'; $lang->block->typeList->product['involved'] = 'Beteiligt'; -$lang->block->typeList->program['undone'] = 'Nicht abgeschlossen'; -$lang->block->typeList->program['doing'] = 'In Arbeit'; -$lang->block->typeList->program['all'] = 'Alle'; -$lang->block->typeList->program['involved'] = 'Betieligt'; +$lang->block->typeList->project['undone'] = 'Nicht abgeschlossen'; +$lang->block->typeList->project['doing'] = 'In Arbeit'; +$lang->block->typeList->project['all'] = 'Alle'; +$lang->block->typeList->project['involved'] = 'Betieligt'; -$lang->block->typeList->project['undone'] = 'Unfinished'; -$lang->block->typeList->project['doing'] = 'Ongoing'; -$lang->block->typeList->project['all'] = 'All'; -$lang->block->typeList->project['involved'] = 'Involved'; +$lang->block->typeList->execution['undone'] = 'Unfinished'; +$lang->block->typeList->execution['doing'] = 'Ongoing'; +$lang->block->typeList->execution['all'] = 'All'; +$lang->block->typeList->execution['involved'] = 'Involved'; $lang->block->typeList->scrum['undone'] = 'Unfinished'; $lang->block->typeList->scrum['doing'] = 'Ongoing中'; @@ -499,27 +504,27 @@ $lang->block->typeList->testtask['blocked'] = 'Blockiert'; $lang->block->typeList->testtask['done'] = 'Erledigt'; $lang->block->typeList->testtask['all'] = 'Alle'; -$lang->block->modules['program']->moreLinkList = new stdclass(); -$lang->block->modules['program']->moreLinkList->recentproject = 'project|prjbrowse|'; -$lang->block->modules['program']->moreLinkList->statistic = 'project|prjbrowse|'; -$lang->block->modules['program']->moreLinkList->project = 'project|prjbrowse|'; -$lang->block->modules['program']->moreLinkList->cmmireport = 'weekly|index|'; -$lang->block->modules['program']->moreLinkList->cmmiestimate = 'workestimation|index|'; -$lang->block->modules['program']->moreLinkList->cmmiissue = 'issue|browse|'; -$lang->block->modules['program']->moreLinkList->cmmirisk = 'risk|browse|'; -$lang->block->modules['program']->moreLinkList->scrumlist = 'project|all|'; -$lang->block->modules['program']->moreLinkList->scrumtest = 'testtask|browse|'; -$lang->block->modules['program']->moreLinkList->scrumproduct = 'product|all|'; -$lang->block->modules['program']->moreLinkList->sprint = 'project|all|'; -$lang->block->modules['program']->moreLinkList->projectdynamic = 'company|dynamic|'; +$lang->block->modules['project']->moreLinkList = new stdclass(); +$lang->block->modules['project']->moreLinkList->recentproject = 'project|browse|'; +$lang->block->modules['project']->moreLinkList->statistic = 'project|browse|'; +$lang->block->modules['project']->moreLinkList->project = 'project|browse|'; +$lang->block->modules['project']->moreLinkList->cmmireport = 'weekly|index|'; +$lang->block->modules['project']->moreLinkList->cmmiestimate = 'workestimation|index|'; +$lang->block->modules['project']->moreLinkList->cmmiissue = 'issue|browse|'; +$lang->block->modules['project']->moreLinkList->cmmirisk = 'risk|browse|'; +$lang->block->modules['project']->moreLinkList->scrumlist = 'project|all|'; +$lang->block->modules['project']->moreLinkList->scrumtest = 'testtask|browse|'; +$lang->block->modules['project']->moreLinkList->scrumproduct = 'product|all|'; +$lang->block->modules['project']->moreLinkList->sprint = 'project|all|'; +$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|'; $lang->block->modules['product']->moreLinkList = new stdclass(); $lang->block->modules['product']->moreLinkList->list = 'product|all|'; $lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s'; -$lang->block->modules['project']->moreLinkList = new stdclass(); -$lang->block->modules['project']->moreLinkList->list = 'project|all|status=%s&project='; -$lang->block->modules['project']->moreLinkList->task = 'my|task|type=%s'; +$lang->block->modules['execution']->moreLinkList = new stdclass(); +$lang->block->modules['execution']->moreLinkList->list = 'execution|all|status=%s&executionID='; +$lang->block->modules['execution']->moreLinkList->task = 'my|task|type=%s'; $lang->block->modules['qa']->moreLinkList = new stdclass(); $lang->block->modules['qa']->moreLinkList->bug = 'my|bug|type=%s'; @@ -541,9 +546,9 @@ $lang->block->welcomeList['19:00'] = 'Guten Abend, %s'; $lang->block->gridOptions[8] = 'Links'; $lang->block->gridOptions[4] = 'Rechts'; -$lang->block->flowchart = array(); -$lang->block->flowchart['admin'] = array('Administrator', 'Abteilung erstellen', 'Benutzer erstellen', 'Rechte pflegen'); -$lang->block->flowchart['product'] = array($lang->productCommon . ' Besitzer', $lang->productCommon . ' erstellen', 'Module pflegen', 'Pläne pflegen', 'Storys pflegen', 'Release erstellen'); -$lang->block->flowchart['project'] = array('Scrum Master', $lang->executionCommon . ' erstellen', 'Teams pflegen', $lang->productCommon . ' verknüpfen', 'Storys verknüpfen', 'Aufgaben aufteilen'); -$lang->block->flowchart['dev'] = array('Entwickler', 'Aufgabe/Bugs anfordern', 'Update Status', 'Aufgaben/Bugs abschließen'); -$lang->block->flowchart['tester'] = array('QS Team', 'Fälle erstellen', 'Fälle ausführen', 'Bug Berichte', 'Bugs überprüfen', 'Bugs schließen'); +$lang->block->flowchart = array(); +$lang->block->flowchart['admin'] = array('Administrator', 'Abteilung erstellen', 'Benutzer erstellen', 'Rechte pflegen'); +$lang->block->flowchart['product'] = array($lang->productCommon . ' Besitzer', $lang->productCommon . ' erstellen', 'Module pflegen', 'Pläne pflegen', 'Storys pflegen', 'Release erstellen'); +$lang->block->flowchart['execution'] = array('Scrum Master', $lang->executionCommon . ' erstellen', 'Teams pflegen', $lang->productCommon . ' verknüpfen', 'Storys verknüpfen', 'Aufgaben aufteilen'); +$lang->block->flowchart['dev'] = array('Entwickler', 'Aufgabe/Bugs anfordern', 'Update Status', 'Aufgaben/Bugs abschließen'); +$lang->block->flowchart['tester'] = array('QS Team', 'Fälle erstellen', 'Fälle ausführen', 'Bug Berichte', 'Bugs überprüfen', 'Bugs schließen'); diff --git a/module/block/lang/en.php b/module/block/lang/en.php index f94cb2d5b9..6e00d17080 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -42,7 +42,7 @@ $lang->block->leftToday = 'Remained Work'; $lang->block->myTask = 'My Tasks'; $lang->block->myStory = 'Stories'; $lang->block->myBug = 'Bugs'; -$lang->block->myProject = 'Unclosed ' . $lang->executionCommon . 's'; +$lang->block->myExecution = 'Unclosed ' . $lang->executionCommon . 's'; $lang->block->myProduct = 'Unclosed ' . $lang->productCommon . 's'; $lang->block->delayed = 'Delayed'; $lang->block->noData = 'No data on this type of reports.'; @@ -98,71 +98,71 @@ $lang->block->spent = 'Has Been Spent'; $lang->block->budget = 'Budget'; $lang->block->left = 'Residuals'; -$lang->block->default['waterfall']['program']['1']['title'] = 'Project Weekly'; -$lang->block->default['waterfall']['program']['1']['block'] = 'waterfallreport'; -$lang->block->default['waterfall']['program']['1']['source'] = 'program'; -$lang->block->default['waterfall']['program']['1']['grid'] = 8; +$lang->block->default['waterfall']['project']['1']['title'] = 'Project Weekly'; +$lang->block->default['waterfall']['project']['1']['block'] = 'waterfallreport'; +$lang->block->default['waterfall']['project']['1']['source'] = 'project'; +$lang->block->default['waterfall']['project']['1']['grid'] = 8; -$lang->block->default['waterfall']['program']['2']['title'] = 'Estimate'; -$lang->block->default['waterfall']['program']['2']['block'] = 'waterfallestimate'; -$lang->block->default['waterfall']['program']['2']['source'] = 'program'; -$lang->block->default['waterfall']['program']['2']['grid'] = 4; +$lang->block->default['waterfall']['project']['2']['title'] = 'Estimate'; +$lang->block->default['waterfall']['project']['2']['block'] = 'waterfallestimate'; +$lang->block->default['waterfall']['project']['2']['source'] = 'project'; +$lang->block->default['waterfall']['project']['2']['grid'] = 4; -$lang->block->default['waterfall']['program']['3']['title'] = 'Plan Gantt Chart'; -$lang->block->default['waterfall']['program']['3']['block'] = 'waterfallgantt'; -$lang->block->default['waterfall']['program']['3']['source'] = 'program'; -$lang->block->default['waterfall']['program']['3']['grid'] = 8; +$lang->block->default['waterfall']['project']['3']['title'] = 'Plan Gantt Chart'; +$lang->block->default['waterfall']['project']['3']['block'] = 'waterfallgantt'; +$lang->block->default['waterfall']['project']['3']['source'] = 'project'; +$lang->block->default['waterfall']['project']['3']['grid'] = 8; -$lang->block->default['waterfall']['program']['4']['title'] = 'Progress Chart'; -$lang->block->default['waterfall']['program']['4']['block'] = 'waterfallprogress'; -$lang->block->default['waterfall']['program']['4']['grid'] = 4; +$lang->block->default['waterfall']['project']['4']['title'] = 'Progress Chart'; +$lang->block->default['waterfall']['project']['4']['block'] = 'waterfallprogress'; +$lang->block->default['waterfall']['project']['4']['grid'] = 4; -$lang->block->default['waterfall']['program']['5']['title'] = 'Program Issue'; -$lang->block->default['waterfall']['program']['5']['block'] = 'waterfallissue'; -$lang->block->default['waterfall']['program']['5']['source'] = 'program'; -$lang->block->default['waterfall']['program']['5']['grid'] = 8; +$lang->block->default['waterfall']['project']['5']['title'] = 'Project Issue'; +$lang->block->default['waterfall']['project']['5']['block'] = 'waterfallissue'; +$lang->block->default['waterfall']['project']['5']['source'] = 'project'; +$lang->block->default['waterfall']['project']['5']['grid'] = 8; -$lang->block->default['waterfall']['program']['5']['params']['type'] = 'all'; -$lang->block->default['waterfall']['program']['5']['params']['count'] = '15'; -$lang->block->default['waterfall']['program']['5']['params']['orderBy'] = 'id_desc'; +$lang->block->default['waterfall']['project']['5']['params']['type'] = 'all'; +$lang->block->default['waterfall']['project']['5']['params']['count'] = '15'; +$lang->block->default['waterfall']['project']['5']['params']['orderBy'] = 'id_desc'; -$lang->block->default['waterfall']['program']['6']['title'] = 'Dynamic'; -$lang->block->default['waterfall']['program']['6']['block'] = 'projectdynamic'; -$lang->block->default['waterfall']['program']['6']['grid'] = 4; -$lang->block->default['waterfall']['program']['6']['source'] = 'program'; +$lang->block->default['waterfall']['project']['6']['title'] = 'Dynamic'; +$lang->block->default['waterfall']['project']['6']['block'] = 'projectdynamic'; +$lang->block->default['waterfall']['project']['6']['grid'] = 4; +$lang->block->default['waterfall']['project']['6']['source'] = 'project'; -$lang->block->default['waterfall']['program']['7']['title'] = 'Project Risk'; -$lang->block->default['waterfall']['program']['7']['block'] = 'waterfallrisk'; -$lang->block->default['waterfall']['program']['7']['source'] = 'program'; -$lang->block->default['waterfall']['program']['7']['grid'] = 8; +$lang->block->default['waterfall']['project']['7']['title'] = 'Project Risk'; +$lang->block->default['waterfall']['project']['7']['block'] = 'waterfallrisk'; +$lang->block->default['waterfall']['project']['7']['source'] = 'project'; +$lang->block->default['waterfall']['project']['7']['grid'] = 8; -$lang->block->default['waterfall']['program']['7']['params']['type'] = 'all'; -$lang->block->default['waterfall']['program']['7']['params']['count'] = '15'; -$lang->block->default['waterfall']['program']['7']['params']['orderBy'] = 'id_desc'; +$lang->block->default['waterfall']['project']['7']['params']['type'] = 'all'; +$lang->block->default['waterfall']['project']['7']['params']['count'] = '15'; +$lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc'; -$lang->block->default['scrum']['program']['1']['title'] = 'Project Overview'; -$lang->block->default['scrum']['program']['1']['block'] = 'scrumoverview'; -$lang->block->default['scrum']['program']['1']['grid'] = 8; +$lang->block->default['scrum']['project']['1']['title'] = 'Project Overview'; +$lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview'; +$lang->block->default['scrum']['project']['1']['grid'] = 8; -$lang->block->default['scrum']['program']['2']['title'] = $lang->executionCommon . ' List'; -$lang->block->default['scrum']['program']['2']['block'] = 'scrumlist'; -$lang->block->default['scrum']['program']['2']['grid'] = 8; +$lang->block->default['scrum']['project']['2']['title'] = $lang->executionCommon . ' List'; +$lang->block->default['scrum']['project']['2']['block'] = 'scrumlist'; +$lang->block->default['scrum']['project']['2']['grid'] = 8; -$lang->block->default['scrum']['program']['3']['title'] = 'Test Version'; -$lang->block->default['scrum']['program']['3']['block'] = 'scrumtest'; -$lang->block->default['scrum']['program']['3']['grid'] = 8; +$lang->block->default['scrum']['project']['3']['title'] = 'Test Version'; +$lang->block->default['scrum']['project']['3']['block'] = 'scrumtest'; +$lang->block->default['scrum']['project']['3']['grid'] = 8; -$lang->block->default['scrum']['program']['3']['params']['type'] = 'wait'; -$lang->block->default['scrum']['program']['3']['params']['count'] = '15'; -$lang->block->default['scrum']['program']['3']['params']['orderBy'] = 'id_desc'; +$lang->block->default['scrum']['project']['3']['params']['type'] = 'wait'; +$lang->block->default['scrum']['project']['3']['params']['count'] = '15'; +$lang->block->default['scrum']['project']['3']['params']['orderBy'] = 'id_desc'; -$lang->block->default['scrum']['program']['4']['title'] = $lang->executionCommon . ' Overview'; -$lang->block->default['scrum']['program']['4']['block'] = 'sprint'; -$lang->block->default['scrum']['program']['4']['grid'] = 4; +$lang->block->default['scrum']['project']['4']['title'] = $lang->executionCommon . ' Overview'; +$lang->block->default['scrum']['project']['4']['block'] = 'sprint'; +$lang->block->default['scrum']['project']['4']['grid'] = 4; -$lang->block->default['scrum']['program']['5']['title'] = 'Dynamic'; -$lang->block->default['scrum']['program']['5']['block'] = 'projectdynamic'; -$lang->block->default['scrum']['program']['5']['grid'] = 4; +$lang->block->default['scrum']['project']['5']['title'] = 'Dynamic'; +$lang->block->default['scrum']['project']['5']['block'] = 'projectdynamic'; +$lang->block->default['scrum']['project']['5']['grid'] = 4; $lang->block->default['product']['1']['title'] = $lang->productCommon . ' Report'; $lang->block->default['product']['1']['block'] = 'statistic'; @@ -190,39 +190,39 @@ $lang->block->default['product']['4']['params']['count'] = 15; $lang->block->default['product']['4']['params']['orderBy'] = 'id_desc'; $lang->block->default['product']['4']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['1']['title'] = 'Execution Report'; -$lang->block->default['project']['1']['block'] = 'statistic'; -$lang->block->default['project']['1']['grid'] = 8; +$lang->block->default['execution']['1']['title'] = 'Execution Report'; +$lang->block->default['execution']['1']['block'] = 'statistic'; +$lang->block->default['execution']['1']['grid'] = 8; -$lang->block->default['project']['1']['params']['type'] = 'all'; -$lang->block->default['project']['1']['params']['count'] = '20'; +$lang->block->default['execution']['1']['params']['type'] = 'all'; +$lang->block->default['execution']['1']['params']['count'] = '20'; -$lang->block->default['project']['2']['title'] = 'Execution Overview'; -$lang->block->default['project']['2']['block'] = 'overview'; -$lang->block->default['project']['2']['grid'] = 4; +$lang->block->default['execution']['2']['title'] = 'Execution Overview'; +$lang->block->default['execution']['2']['block'] = 'overview'; +$lang->block->default['execution']['2']['grid'] = 4; -$lang->block->default['project']['3']['title'] = 'Active ' . 'Executions'; -$lang->block->default['project']['3']['block'] = 'list'; -$lang->block->default['project']['3']['grid'] = 8; +$lang->block->default['execution']['3']['title'] = 'Active Executions'; +$lang->block->default['execution']['3']['block'] = 'list'; +$lang->block->default['execution']['3']['grid'] = 8; -$lang->block->default['project']['3']['params']['count'] = 15; -$lang->block->default['project']['3']['params']['orderBy'] = 'id_desc'; -$lang->block->default['project']['3']['params']['type'] = 'undone'; +$lang->block->default['execution']['3']['params']['count'] = 15; +$lang->block->default['execution']['3']['params']['orderBy'] = 'id_desc'; +$lang->block->default['execution']['3']['params']['type'] = 'undone'; -$lang->block->default['project']['4']['title'] = 'My Tasks'; -$lang->block->default['project']['4']['block'] = 'task'; -$lang->block->default['project']['4']['grid'] = 4; +$lang->block->default['execution']['4']['title'] = 'My Tasks'; +$lang->block->default['execution']['4']['block'] = 'task'; +$lang->block->default['execution']['4']['grid'] = 4; -$lang->block->default['project']['4']['params']['count'] = 15; -$lang->block->default['project']['4']['params']['orderBy'] = 'id_desc'; -$lang->block->default['project']['4']['params']['type'] = 'assignedTo'; +$lang->block->default['execution']['4']['params']['count'] = 15; +$lang->block->default['execution']['4']['params']['orderBy'] = 'id_desc'; +$lang->block->default['execution']['4']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['5']['title'] = 'Build List'; -$lang->block->default['project']['5']['block'] = 'build'; -$lang->block->default['project']['5']['grid'] = 8; +$lang->block->default['execution']['5']['title'] = 'Build List'; +$lang->block->default['execution']['5']['block'] = 'build'; +$lang->block->default['execution']['5']['grid'] = 8; -$lang->block->default['project']['5']['params']['count'] = 15; -$lang->block->default['project']['5']['params']['orderBy'] = 'id_desc'; +$lang->block->default['execution']['5']['params']['count'] = 15; +$lang->block->default['execution']['5']['params']['orderBy'] = 'id_desc'; $lang->block->default['qa']['1']['title'] = 'Test Report'; $lang->block->default['qa']['1']['block'] = 'statistic'; @@ -277,7 +277,7 @@ $lang->block->default['full']['my']['3']['params']['count'] = '20'; $lang->block->default['full']['my']['4']['title'] = 'Project Statistic'; $lang->block->default['full']['my']['4']['block'] = 'statistic'; -$lang->block->default['full']['my']['4']['source'] = 'program'; +$lang->block->default['full']['my']['4']['source'] = 'project'; $lang->block->default['full']['my']['4']['grid'] = 8; $lang->block->default['full']['my']['5']['title'] = 'Personal Contribution'; @@ -287,7 +287,7 @@ $lang->block->default['full']['my']['5']['grid'] = 4; $lang->block->default['full']['my']['6']['title'] = 'Recent Projects'; $lang->block->default['full']['my']['6']['block'] = 'recentproject'; -$lang->block->default['full']['my']['6']['source'] = 'program'; +$lang->block->default['full']['my']['6']['source'] = 'project'; $lang->block->default['full']['my']['6']['grid'] = 8; $lang->block->default['full']['my']['7']['title'] = 'Assigned To Me'; @@ -303,13 +303,13 @@ $lang->block->default['full']['my']['7']['params']['issueNum'] = '20'; $lang->block->default['full']['my']['7']['params']['storyNum'] = '20'; $lang->block->default['full']['my']['8']['title'] = 'Human Input'; -$lang->block->default['full']['my']['8']['block'] = 'programteam'; -$lang->block->default['full']['my']['8']['source'] = 'program'; +$lang->block->default['full']['my']['8']['block'] = 'projectteam'; +$lang->block->default['full']['my']['8']['source'] = 'project'; $lang->block->default['full']['my']['8']['grid'] = 8; -$lang->block->default['full']['my']['9']['title'] = $lang->executionCommon . ' List'; -$lang->block->default['full']['my']['9']['block'] = 'program'; -$lang->block->default['full']['my']['9']['source'] = 'program'; +$lang->block->default['full']['my']['9']['title'] = 'Project List'; +$lang->block->default['full']['my']['9']['block'] = 'project'; +$lang->block->default['full']['my']['9']['source'] = 'project'; $lang->block->default['full']['my']['9']['grid'] = 8; $lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc'; @@ -319,40 +319,39 @@ $lang->block->count = 'Count'; $lang->block->type = 'Type'; $lang->block->orderBy = 'Order by'; -$lang->block->availableBlocks = new stdclass(); +$lang->block->availableBlocks = new stdclass(); +$lang->block->availableBlocks->todo = 'My Todos'; +$lang->block->availableBlocks->task = 'My Tasks'; +$lang->block->availableBlocks->bug = 'My Bugs'; +$lang->block->availableBlocks->case = 'My Cases'; +$lang->block->availableBlocks->story = 'My Stories'; +$lang->block->availableBlocks->product = $lang->productCommon . 's'; +$lang->block->availableBlocks->execution = $lang->executionCommon . 's'; +$lang->block->availableBlocks->plan = 'Plans'; +$lang->block->availableBlocks->release = 'Releases'; +$lang->block->availableBlocks->build = 'Builds'; +$lang->block->availableBlocks->testtask = 'Requests'; +$lang->block->availableBlocks->risk = 'My Risks'; +$lang->block->availableBlocks->issue = 'My Issues'; -$lang->block->availableBlocks->todo = 'My Todos'; -$lang->block->availableBlocks->task = 'My Tasks'; -$lang->block->availableBlocks->bug = 'My Bugs'; -$lang->block->availableBlocks->case = 'My Cases'; -$lang->block->availableBlocks->story = 'My Stories'; -$lang->block->availableBlocks->product = $lang->productCommon . 's'; -$lang->block->availableBlocks->project = $lang->executionCommon . 's'; -$lang->block->availableBlocks->plan = 'Plans'; -$lang->block->availableBlocks->release = 'Releases'; -$lang->block->availableBlocks->build = 'Builds'; -$lang->block->availableBlocks->testtask = 'Requests'; -$lang->block->availableBlocks->risk = 'My Risks'; -$lang->block->availableBlocks->issue = 'My Issues'; +$lang->block->moduleList['project'] = 'Project'; +$lang->block->moduleList['product'] = $lang->productCommon; +$lang->block->moduleList['execution'] = $lang->executionCommon; +$lang->block->moduleList['qa'] = 'Test'; +$lang->block->moduleList['todo'] = 'Todo'; -$lang->block->moduleList['program'] = 'Project'; -$lang->block->moduleList['product'] = $lang->productCommon; -$lang->block->moduleList['project'] = $lang->executionCommon; -$lang->block->moduleList['qa'] = 'Test'; -$lang->block->moduleList['todo'] = 'Todo'; - -$lang->block->modules['program'] = new stdclass(); -$lang->block->modules['program']->availableBlocks = new stdclass(); -$lang->block->modules['program']->availableBlocks->program = 'Project List'; -$lang->block->modules['program']->availableBlocks->recentproject = 'Recent Project'; -$lang->block->modules['program']->availableBlocks->statistic = 'Project Statistic'; -$lang->block->modules['program']->availableBlocks->programteam = 'Project Human Input'; +$lang->block->modules['project'] = new stdclass(); +$lang->block->modules['project']->availableBlocks = new stdclass(); +$lang->block->modules['project']->availableBlocks->project = 'Project List'; +$lang->block->modules['project']->availableBlocks->recentproject = 'Recent Project'; +$lang->block->modules['project']->availableBlocks->statistic = 'Project Statistic'; +$lang->block->modules['project']->availableBlocks->projectteam = 'Project Human Input'; $lang->block->modules['scrum']['index'] = new stdclass(); $lang->block->modules['scrum']['index']->availableBlocks = new stdclass(); $lang->block->modules['scrum']['index']->availableBlocks->scrumoverview = 'Project Overview'; -$lang->block->modules['scrum']['index']->availableBlocks->scrumlist = 'Project List'; -$lang->block->modules['scrum']['index']->availableBlocks->sprint = 'Project Overview'; +$lang->block->modules['scrum']['index']->availableBlocks->scrumlist = $lang->executionCommon . ' List'; +$lang->block->modules['scrum']['index']->availableBlocks->sprint = $lang->executionCommon . ' Overview'; $lang->block->modules['scrum']['index']->availableBlocks->scrumtest = 'Test Version'; $lang->block->modules['scrum']['index']->availableBlocks->projectdynamic = 'Dynamics'; @@ -375,13 +374,13 @@ $lang->block->modules['product']->availableBlocks->story = 'Story'; $lang->block->modules['product']->availableBlocks->plan = 'Plan'; $lang->block->modules['product']->availableBlocks->release = 'Release'; -$lang->block->modules['project'] = new stdclass(); -$lang->block->modules['project']->availableBlocks = new stdclass(); -$lang->block->modules['project']->availableBlocks->statistic = $lang->executionCommon . ' Statistics'; -$lang->block->modules['project']->availableBlocks->overview = $lang->executionCommon . ' Overview'; -$lang->block->modules['project']->availableBlocks->list = $lang->executionCommon . ' List'; -$lang->block->modules['project']->availableBlocks->task = 'Task'; -$lang->block->modules['project']->availableBlocks->build = 'Build'; +$lang->block->modules['execution'] = new stdclass(); +$lang->block->modules['execution']->availableBlocks = new stdclass(); +$lang->block->modules['execution']->availableBlocks->statistic = $lang->executionCommon . ' Statistics'; +$lang->block->modules['execution']->availableBlocks->overview = $lang->executionCommon . ' Overview'; +$lang->block->modules['execution']->availableBlocks->list = $lang->executionCommon . ' List'; +$lang->block->modules['execution']->availableBlocks->task = 'Task'; +$lang->block->modules['execution']->availableBlocks->build = 'Build'; $lang->block->modules['qa'] = new stdclass(); $lang->block->modules['qa']->availableBlocks = new stdclass(); @@ -409,6 +408,12 @@ $lang->block->orderByList->project['id_desc'] = 'Project ID DESC'; $lang->block->orderByList->project['status_asc'] = 'Project Status ASC'; $lang->block->orderByList->project['status_desc'] = 'Project Status DESC'; +$lang->block->orderByList->execution = array(); +$lang->block->orderByList->execution['id_asc'] = 'Execution ID ASC'; +$lang->block->orderByList->execution['id_desc'] = 'Execution ID DESC'; +$lang->block->orderByList->execution['status_asc'] = 'Execution Status ASC'; +$lang->block->orderByList->execution['status_desc'] = 'Execution Status DESC'; + $lang->block->orderByList->task = array(); $lang->block->orderByList->task['id_asc'] = 'Task ID ASC'; $lang->block->orderByList->task['id_desc'] = 'Task ID DESC'; @@ -478,16 +483,16 @@ $lang->block->typeList->product['closed'] = 'Closed'; $lang->block->typeList->product['all'] = 'All'; $lang->block->typeList->product['involved'] = 'Involved'; -$lang->block->typeList->program['undone'] = 'Unfinished'; -$lang->block->typeList->program['doing'] = 'Ongoing'; -$lang->block->typeList->program['all'] = 'All'; -$lang->block->typeList->program['involved'] = 'Involved'; - $lang->block->typeList->project['undone'] = 'Unfinished'; $lang->block->typeList->project['doing'] = 'Ongoing'; $lang->block->typeList->project['all'] = 'All'; $lang->block->typeList->project['involved'] = 'Involved'; +$lang->block->typeList->execution['undone'] = 'Unfinished'; +$lang->block->typeList->execution['doing'] = 'Ongoing'; +$lang->block->typeList->execution['all'] = 'All'; +$lang->block->typeList->execution['involved'] = 'Involved'; + $lang->block->typeList->scrum['undone'] = 'Unfinished'; $lang->block->typeList->scrum['doing'] = 'Ongoing中'; $lang->block->typeList->scrum['all'] = 'All'; @@ -499,27 +504,27 @@ $lang->block->typeList->testtask['blocked'] = 'Blocked'; $lang->block->typeList->testtask['done'] = 'Done'; $lang->block->typeList->testtask['all'] = 'All'; -$lang->block->modules['program']->moreLinkList = new stdclass(); -$lang->block->modules['program']->moreLinkList->recentproject = 'project|prjbrowse|'; -$lang->block->modules['program']->moreLinkList->statistic = 'project|prjbrowse|'; -$lang->block->modules['program']->moreLinkList->project = 'project|prjbrowse|'; -$lang->block->modules['program']->moreLinkList->cmmireport = 'weekly|index|'; -$lang->block->modules['program']->moreLinkList->cmmiestimate = 'workestimation|index|'; -$lang->block->modules['program']->moreLinkList->cmmiissue = 'issue|browse|'; -$lang->block->modules['program']->moreLinkList->cmmirisk = 'risk|browse|'; -$lang->block->modules['program']->moreLinkList->scrumlist = 'project|all|'; -$lang->block->modules['program']->moreLinkList->scrumtest = 'testtask|browse|'; -$lang->block->modules['program']->moreLinkList->scrumproduct = 'product|all|'; -$lang->block->modules['program']->moreLinkList->sprint = 'project|all|'; -$lang->block->modules['program']->moreLinkList->projectdynamic = 'company|dynamic|'; +$lang->block->modules['project']->moreLinkList = new stdclass(); +$lang->block->modules['project']->moreLinkList->recentproject = 'project|browse|'; +$lang->block->modules['project']->moreLinkList->statistic = 'project|browse|'; +$lang->block->modules['project']->moreLinkList->project = 'project|browse|'; +$lang->block->modules['project']->moreLinkList->cmmireport = 'weekly|index|'; +$lang->block->modules['project']->moreLinkList->cmmiestimate = 'workestimation|index|'; +$lang->block->modules['project']->moreLinkList->cmmiissue = 'issue|browse|'; +$lang->block->modules['project']->moreLinkList->cmmirisk = 'risk|browse|'; +$lang->block->modules['project']->moreLinkList->scrumlist = 'project|all|'; +$lang->block->modules['project']->moreLinkList->scrumtest = 'testtask|browse|'; +$lang->block->modules['project']->moreLinkList->scrumproduct = 'product|all|'; +$lang->block->modules['project']->moreLinkList->sprint = 'project|all|'; +$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|'; $lang->block->modules['product']->moreLinkList = new stdclass(); $lang->block->modules['product']->moreLinkList->list = 'product|all|'; $lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s'; -$lang->block->modules['project']->moreLinkList = new stdclass(); -$lang->block->modules['project']->moreLinkList->list = 'project|all|status=%s&project='; -$lang->block->modules['project']->moreLinkList->task = 'my|task|type=%s'; +$lang->block->modules['execution']->moreLinkList = new stdclass(); +$lang->block->modules['execution']->moreLinkList->list = 'execution|all|status=%s&executionID='; +$lang->block->modules['execution']->moreLinkList->task = 'my|task|type=%s'; $lang->block->modules['qa']->moreLinkList = new stdclass(); $lang->block->modules['qa']->moreLinkList->bug = 'my|bug|type=%s'; @@ -541,9 +546,9 @@ $lang->block->welcomeList['19:00'] = 'Good evening, %s'; $lang->block->gridOptions[8] = 'Left'; $lang->block->gridOptions[4] = 'Right'; -$lang->block->flowchart = array(); -$lang->block->flowchart['admin'] = array('Administrator', 'Add Departments', 'Add Users', 'Maintain Privileges'); -$lang->block->flowchart['product'] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Releases'); -$lang->block->flowchart['project'] = array('Scrum Master', 'Add ' . $lang->executionCommon . 's', 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Create Tasks'); -$lang->block->flowchart['dev'] = array('Dev Team', 'Claim Tasks/Bugs', 'Update Status', 'Finish Tasks/Bugs'); -$lang->block->flowchart['tester'] = array('Test Team', 'Write Cases', 'Run Cases', 'Report Bugs', 'Verify Bugs', 'Close Bugs'); +$lang->block->flowchart = array(); +$lang->block->flowchart['admin'] = array('Administrator', 'Add Departments', 'Add Users', 'Maintain Privileges'); +$lang->block->flowchart['product'] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Releases'); +$lang->block->flowchart['execution'] = array('Scrum Master', 'Add ' . $lang->executionCommon . 's', 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Create Tasks'); +$lang->block->flowchart['dev'] = array('Dev Team', 'Claim Tasks/Bugs', 'Update Status', 'Finish Tasks/Bugs'); +$lang->block->flowchart['tester'] = array('Test Team', 'Write Cases', 'Run Cases', 'Report Bugs', 'Verify Bugs', 'Close Bugs'); diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index 54a644a751..b642f4e270 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -42,7 +42,7 @@ $lang->block->leftToday = 'Reste à faire'; $lang->block->myTask = 'Mes Tâches'; $lang->block->myStory = 'Stories'; $lang->block->myBug = 'Bugs'; -$lang->block->myProject = 'Unclosed ' . $lang->executionCommon . 's'; +$lang->block->myExecution = 'Unclosed ' . $lang->executionCommon . 's'; $lang->block->myProduct = 'Unclosed ' . $lang->productCommon . 's'; $lang->block->delayed = 'Ajourné'; $lang->block->noData = 'Pas de données pour ce type de rapport.'; @@ -98,71 +98,71 @@ $lang->block->spent = 'Has Been Spent'; $lang->block->budget = 'Budget'; $lang->block->left = 'Residuals'; -$lang->block->default['waterfall']['program']['1']['title'] = $lang->executionCommon . 'Weekly'; -$lang->block->default['waterfall']['program']['1']['block'] = 'waterfallreport'; -$lang->block->default['waterfall']['program']['1']['source'] = 'project'; -$lang->block->default['waterfall']['program']['1']['grid'] = 8; +$lang->block->default['waterfall']['project']['1']['title'] = 'Project Weekly'; +$lang->block->default['waterfall']['project']['1']['block'] = 'waterfallreport'; +$lang->block->default['waterfall']['project']['1']['source'] = 'project'; +$lang->block->default['waterfall']['project']['1']['grid'] = 8; -$lang->block->default['waterfall']['program']['2']['title'] = 'Estimate'; -$lang->block->default['waterfall']['program']['2']['block'] = 'waterfallestimate'; -$lang->block->default['waterfall']['program']['2']['source'] = 'project'; -$lang->block->default['waterfall']['program']['2']['grid'] = 4; +$lang->block->default['waterfall']['project']['2']['title'] = 'Estimate'; +$lang->block->default['waterfall']['project']['2']['block'] = 'waterfallestimate'; +$lang->block->default['waterfall']['project']['2']['source'] = 'project'; +$lang->block->default['waterfall']['project']['2']['grid'] = 4; -$lang->block->default['waterfall']['program']['3']['title'] = 'Plan Gantt Chart'; -$lang->block->default['waterfall']['program']['3']['block'] = 'waterfallgantt'; -$lang->block->default['waterfall']['program']['3']['source'] = 'project'; -$lang->block->default['waterfall']['program']['3']['grid'] = 8; +$lang->block->default['waterfall']['project']['3']['title'] = 'Plan Gantt Chart'; +$lang->block->default['waterfall']['project']['3']['block'] = 'waterfallgantt'; +$lang->block->default['waterfall']['project']['3']['source'] = 'project'; +$lang->block->default['waterfall']['project']['3']['grid'] = 8; -$lang->block->default['waterfall']['program']['4']['title'] = 'Progress Chart'; -$lang->block->default['waterfall']['program']['4']['block'] = 'waterfallprogress'; -$lang->block->default['waterfall']['program']['4']['grid'] = 4; +$lang->block->default['waterfall']['project']['4']['title'] = 'Progress Chart'; +$lang->block->default['waterfall']['project']['4']['block'] = 'waterfallprogress'; +$lang->block->default['waterfall']['project']['4']['grid'] = 4; -$lang->block->default['waterfall']['program']['5']['title'] = 'project Issue'; -$lang->block->default['waterfall']['program']['5']['block'] = 'waterfallissue'; -$lang->block->default['waterfall']['program']['5']['source'] = 'project'; -$lang->block->default['waterfall']['program']['5']['grid'] = 8; +$lang->block->default['waterfall']['project']['5']['title'] = 'project Issue'; +$lang->block->default['waterfall']['project']['5']['block'] = 'waterfallissue'; +$lang->block->default['waterfall']['project']['5']['source'] = 'project'; +$lang->block->default['waterfall']['project']['5']['grid'] = 8; -$lang->block->default['waterfall']['program']['5']['params']['type'] = 'all'; -$lang->block->default['waterfall']['program']['5']['params']['count'] = '15'; -$lang->block->default['waterfall']['program']['5']['params']['orderBy'] = 'id_desc'; +$lang->block->default['waterfall']['project']['5']['params']['type'] = 'all'; +$lang->block->default['waterfall']['project']['5']['params']['count'] = '15'; +$lang->block->default['waterfall']['project']['5']['params']['orderBy'] = 'id_desc'; -$lang->block->default['waterfall']['program']['6']['title'] = 'Dynamic'; -$lang->block->default['waterfall']['program']['6']['block'] = 'dynamic'; -$lang->block->default['waterfall']['program']['6']['grid'] = 4; -$lang->block->default['waterfall']['program']['6']['source'] = ''; +$lang->block->default['waterfall']['project']['6']['title'] = 'Dynamic'; +$lang->block->default['waterfall']['project']['6']['block'] = 'dynamic'; +$lang->block->default['waterfall']['project']['6']['grid'] = 4; +$lang->block->default['waterfall']['project']['6']['source'] = ''; -$lang->block->default['waterfall']['program']['7']['title'] = $lang->executionCommon . 'Risk'; -$lang->block->default['waterfall']['program']['7']['block'] = 'waterfallrisk'; -$lang->block->default['waterfall']['program']['7']['source'] = 'project'; -$lang->block->default['waterfall']['program']['7']['grid'] = 8; +$lang->block->default['waterfall']['project']['7']['title'] = 'Project Risk'; +$lang->block->default['waterfall']['project']['7']['block'] = 'waterfallrisk'; +$lang->block->default['waterfall']['project']['7']['source'] = 'project'; +$lang->block->default['waterfall']['project']['7']['grid'] = 8; -$lang->block->default['waterfall']['program']['7']['params']['type'] = 'all'; -$lang->block->default['waterfall']['program']['7']['params']['count'] = '15'; -$lang->block->default['waterfall']['program']['7']['params']['orderBy'] = 'id_desc'; +$lang->block->default['waterfall']['project']['7']['params']['type'] = 'all'; +$lang->block->default['waterfall']['project']['7']['params']['count'] = '15'; +$lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc'; -$lang->block->default['scrum']['program']['1']['title'] = $lang->executionCommon . ' Overall'; -$lang->block->default['scrum']['program']['1']['block'] = 'scrumoverall'; -$lang->block->default['scrum']['program']['1']['grid'] = 8; +$lang->block->default['scrum']['project']['1']['title'] = 'Project Overall'; +$lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview'; +$lang->block->default['scrum']['project']['1']['grid'] = 8; -$lang->block->default['scrum']['program']['2']['title'] = $lang->executionCommon . ' List'; -$lang->block->default['scrum']['program']['2']['block'] = 'scrumlist'; -$lang->block->default['scrum']['program']['2']['grid'] = 8; +$lang->block->default['scrum']['project']['2']['title'] = $lang->executionCommon . ' List'; +$lang->block->default['scrum']['project']['2']['block'] = 'scrumlist'; +$lang->block->default['scrum']['project']['2']['grid'] = 8; -$lang->block->default['scrum']['program']['3']['title'] = 'Test Version'; -$lang->block->default['scrum']['program']['3']['block'] = 'scrumtest'; -$lang->block->default['scrum']['program']['3']['grid'] = 8; +$lang->block->default['scrum']['project']['3']['title'] = 'Test Version'; +$lang->block->default['scrum']['project']['3']['block'] = 'scrumtest'; +$lang->block->default['scrum']['project']['3']['grid'] = 8; -$lang->block->default['scrum']['program']['3']['params']['type'] = 'all'; -$lang->block->default['scrum']['program']['3']['params']['count'] = '15'; -$lang->block->default['scrum']['program']['3']['params']['orderBy'] = 'id_desc'; +$lang->block->default['scrum']['project']['3']['params']['type'] = 'wait'; +$lang->block->default['scrum']['project']['3']['params']['count'] = '15'; +$lang->block->default['scrum']['project']['3']['params']['orderBy'] = 'id_desc'; -$lang->block->default['scrum']['program']['4']['title'] = $lang->executionCommon . ' Overview'; -$lang->block->default['scrum']['program']['4']['block'] = 'sprint'; -$lang->block->default['scrum']['program']['4']['grid'] = 4; +$lang->block->default['scrum']['project']['4']['title'] = $lang->executionCommon . ' Overview'; +$lang->block->default['scrum']['project']['4']['block'] = 'sprint'; +$lang->block->default['scrum']['project']['4']['grid'] = 4; -$lang->block->default['scrum']['program']['5']['title'] = 'Dynamic'; -$lang->block->default['scrum']['program']['5']['block'] = 'scrumdynamic'; -$lang->block->default['scrum']['program']['5']['grid'] = 4; +$lang->block->default['scrum']['project']['5']['title'] = 'Dynamic'; +$lang->block->default['scrum']['project']['5']['block'] = 'projectdynamic'; +$lang->block->default['scrum']['project']['5']['grid'] = 4; $lang->block->default['product']['1']['title'] = ' Rapport de ' . $lang->productCommon; $lang->block->default['product']['1']['block'] = 'statistic'; @@ -190,39 +190,39 @@ $lang->block->default['product']['4']['params']['count'] = 15; $lang->block->default['product']['4']['params']['orderBy'] = 'id_desc'; $lang->block->default['product']['4']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['1']['title'] = 'Rapport de ' . $lang->executionCommon; -$lang->block->default['project']['1']['block'] = 'statistic'; -$lang->block->default['project']['1']['grid'] = 8; +$lang->block->default['execution']['1']['title'] = 'Rapport de execution'; +$lang->block->default['execution']['1']['block'] = 'statistic'; +$lang->block->default['execution']['1']['grid'] = 8; -$lang->block->default['project']['1']['params']['type'] = 'all'; -$lang->block->default['project']['1']['params']['count'] = '20'; +$lang->block->default['execution']['1']['params']['type'] = 'all'; +$lang->block->default['execution']['1']['params']['count'] = '20'; -$lang->block->default['project']['2']['title'] = "Vue d'ensemble du " . $lang->executionCommon; -$lang->block->default['project']['2']['block'] = 'overview'; -$lang->block->default['project']['2']['grid'] = 4; +$lang->block->default['execution']['2']['title'] = "Vue d'ensemble du execution"; +$lang->block->default['execution']['2']['block'] = 'overview'; +$lang->block->default['execution']['2']['grid'] = 4; -$lang->block->default['project']['3']['title'] = $lang->executionCommon . 's Actifs'; -$lang->block->default['project']['3']['block'] = 'list'; -$lang->block->default['project']['3']['grid'] = 8; +$lang->block->default['execution']['3']['title'] = 'Executions Actifs'; +$lang->block->default['execution']['3']['block'] = 'list'; +$lang->block->default['execution']['3']['grid'] = 8; -$lang->block->default['project']['3']['params']['count'] = 15; -$lang->block->default['project']['3']['params']['orderBy'] = 'id_desc'; -$lang->block->default['project']['3']['params']['type'] = 'undone'; +$lang->block->default['execution']['3']['params']['count'] = 15; +$lang->block->default['execution']['3']['params']['orderBy'] = 'id_desc'; +$lang->block->default['execution']['3']['params']['type'] = 'undone'; -$lang->block->default['project']['4']['title'] = 'Mes Tâches'; -$lang->block->default['project']['4']['block'] = 'task'; -$lang->block->default['project']['4']['grid'] = 4; +$lang->block->default['execution']['4']['title'] = 'Mes Tâches'; +$lang->block->default['execution']['4']['block'] = 'task'; +$lang->block->default['execution']['4']['grid'] = 4; -$lang->block->default['project']['4']['params']['count'] = 15; -$lang->block->default['project']['4']['params']['orderBy'] = 'id_desc'; -$lang->block->default['project']['4']['params']['type'] = 'assignedTo'; +$lang->block->default['execution']['4']['params']['count'] = 15; +$lang->block->default['execution']['4']['params']['orderBy'] = 'id_desc'; +$lang->block->default['execution']['4']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['5']['title'] = 'Build List'; -$lang->block->default['project']['5']['block'] = 'build'; -$lang->block->default['project']['5']['grid'] = 8; +$lang->block->default['execution']['5']['title'] = 'Build List'; +$lang->block->default['execution']['5']['block'] = 'build'; +$lang->block->default['execution']['5']['grid'] = 8; -$lang->block->default['project']['5']['params']['count'] = 15; -$lang->block->default['project']['5']['params']['orderBy'] = 'id_desc'; +$lang->block->default['execution']['5']['params']['count'] = 15; +$lang->block->default['execution']['5']['params']['orderBy'] = 'id_desc'; $lang->block->default['qa']['1']['title'] = 'Rapport de Tests'; $lang->block->default['qa']['1']['block'] = 'statistic'; @@ -253,7 +253,7 @@ $lang->block->default['qa']['3']['params']['type'] = 'assigntome'; $lang->block->default['qa']['4']['title'] = 'Builds en attente'; $lang->block->default['qa']['4']['block'] = 'testtask'; -$lang->block->default['qa']['4']['grid'] = 4; +$lang->block->default['qa']['4']['grid'] = 8; $lang->block->default['qa']['4']['params']['count'] = 15; $lang->block->default['qa']['4']['params']['orderBy'] = 'id_desc'; @@ -269,13 +269,13 @@ $lang->block->default['full']['my']['2']['block'] = 'dynamic'; $lang->block->default['full']['my']['2']['grid'] = 4; $lang->block->default['full']['my']['2']['source'] = ''; -$lang->block->default['full']['my']['3']['title'] = 'My Todos'; -$lang->block->default['full']['my']['3']['block'] = 'list'; -$lang->block->default['full']['my']['3']['grid'] = 4; -$lang->block->default['full']['my']['3']['source'] = 'todo'; +$lang->block->default['full']['my']['3']['title'] = 'My Todos'; +$lang->block->default['full']['my']['3']['block'] = 'list'; +$lang->block->default['full']['my']['3']['grid'] = 4; +$lang->block->default['full']['my']['3']['source'] = 'todo'; $lang->block->default['full']['my']['3']['params']['count'] = '20'; -$lang->block->default['full']['my']['4']['title'] = $lang->executionCommon . ' Statistic'; +$lang->block->default['full']['my']['4']['title'] = 'Project Statistic'; $lang->block->default['full']['my']['4']['block'] = 'statistic'; $lang->block->default['full']['my']['4']['source'] = 'project'; $lang->block->default['full']['my']['4']['grid'] = 8; @@ -285,7 +285,7 @@ $lang->block->default['full']['my']['5']['block'] = 'contribute'; $lang->block->default['full']['my']['5']['source'] = ''; $lang->block->default['full']['my']['5']['grid'] = 4; -$lang->block->default['full']['my']['6']['title'] = 'Recent ' . $lang->executionCommon; +$lang->block->default['full']['my']['6']['title'] = 'Recent Projecets'; $lang->block->default['full']['my']['6']['block'] = 'recentproject'; $lang->block->default['full']['my']['6']['source'] = 'project'; $lang->block->default['full']['my']['6']['grid'] = 8; @@ -303,11 +303,11 @@ $lang->block->default['full']['my']['7']['params']['issueNum'] = '20'; $lang->block->default['full']['my']['7']['params']['storyNum'] = '20'; $lang->block->default['full']['my']['8']['title'] = 'Human Input'; -$lang->block->default['full']['my']['8']['block'] = 'programteam'; -$lang->block->default['full']['my']['8']['source'] = 'program'; +$lang->block->default['full']['my']['8']['block'] = 'projectteam'; +$lang->block->default['full']['my']['8']['source'] = 'project'; $lang->block->default['full']['my']['8']['grid'] = 8; -$lang->block->default['full']['my']['9']['title'] = $lang->executionCommon . ' List'; +$lang->block->default['full']['my']['9']['title'] = 'Project List'; $lang->block->default['full']['my']['9']['block'] = 'project'; $lang->block->default['full']['my']['9']['source'] = 'project'; $lang->block->default['full']['my']['9']['grid'] = 8; @@ -319,38 +319,37 @@ $lang->block->count = 'Numéro'; $lang->block->type = 'Type'; $lang->block->orderBy = 'Trié par'; -$lang->block->availableBlocks = new stdclass(); +$lang->block->availableBlocks = new stdclass(); +$lang->block->availableBlocks->todo = 'Ma Todo List'; +$lang->block->availableBlocks->task = 'Mes Tâches'; +$lang->block->availableBlocks->bug = 'Mes Bugs'; +$lang->block->availableBlocks->case = 'Mes CasTests'; +$lang->block->availableBlocks->story = 'Mes Stories'; +$lang->block->availableBlocks->product = $lang->productCommon . 's'; +$lang->block->availableBlocks->execution = $lang->executionCommon . 's'; +$lang->block->availableBlocks->plan = 'Plans'; +$lang->block->availableBlocks->release = 'Releases'; +$lang->block->availableBlocks->build = 'Builds'; +$lang->block->availableBlocks->testtask = 'Recettes'; +$lang->block->availableBlocks->risk = 'My Risks'; +$lang->block->availableBlocks->issue = 'My Issues'; -$lang->block->availableBlocks->todo = 'Ma Todo List'; -$lang->block->availableBlocks->task = 'Mes Tâches'; -$lang->block->availableBlocks->bug = 'Mes Bugs'; -$lang->block->availableBlocks->case = 'Mes CasTests'; -$lang->block->availableBlocks->story = 'Mes Stories'; -$lang->block->availableBlocks->product = $lang->productCommon . 's'; -$lang->block->availableBlocks->project = $lang->executionCommon . 's'; -$lang->block->availableBlocks->plan = 'Plans'; -$lang->block->availableBlocks->release = 'Releases'; -$lang->block->availableBlocks->build = 'Builds'; -$lang->block->availableBlocks->testtask = 'Recettes'; -$lang->block->availableBlocks->risk = 'My Risks'; -$lang->block->availableBlocks->issue = 'My Issues'; +$lang->block->moduleList['project'] = 'Project'; +$lang->block->moduleList['product'] = $lang->productCommon; +$lang->block->moduleList['execution'] = $lang->executionCommon; +$lang->block->moduleList['qa'] = 'Test'; +$lang->block->moduleList['todo'] = 'Todo'; -$lang->block->moduleList['program'] = 'Project'; -$lang->block->moduleList['product'] = $lang->productCommon; -$lang->block->moduleList['project'] = $lang->executionCommon; -$lang->block->moduleList['qa'] = 'Test'; -$lang->block->moduleList['todo'] = 'Todo'; - -$lang->block->modules['program'] = new stdclass(); -$lang->block->modules['program']->availableBlocks = new stdclass(); -$lang->block->modules['program']->availableBlocks->program = $lang->executionCommon . ' List'; -$lang->block->modules['program']->availableBlocks->recentproject = 'Recent ' . $lang->executionCommon; -$lang->block->modules['program']->availableBlocks->statistic = $lang->executionCommon . ' Statistic'; -$lang->block->modules['program']->availableBlocks->programteam = $lang->executionCommon . 'Human Input'; +$lang->block->modules['project'] = new stdclass(); +$lang->block->modules['project']->availableBlocks = new stdclass(); +$lang->block->modules['project']->availableBlocks->project = 'Project List'; +$lang->block->modules['project']->availableBlocks->recentproject = 'Recent Projects'; +$lang->block->modules['project']->availableBlocks->statistic = 'Project Statistic'; +$lang->block->modules['project']->availableBlocks->projectteam = 'Project Human Input'; $lang->block->modules['scrum']['index'] = new stdclass(); $lang->block->modules['scrum']['index']->availableBlocks = new stdclass(); -$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview = $lang->executionCommon . ' Overview'; +$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview = 'Project Overview'; $lang->block->modules['scrum']['index']->availableBlocks->scrumlist = $lang->executionCommon . ' List'; $lang->block->modules['scrum']['index']->availableBlocks->sprint = $lang->executionCommon . ' Overview'; $lang->block->modules['scrum']['index']->availableBlocks->scrumtest = 'Test Version'; @@ -358,12 +357,12 @@ $lang->block->modules['scrum']['index']->availableBlocks->projectdynamic = 'Dyna $lang->block->modules['waterfall']['index'] = new stdclass(); $lang->block->modules['waterfall']['index']->availableBlocks = new stdclass(); -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport = $lang->executionCommon . ' Weekly'; +$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport = 'Project Weekly'; $lang->block->modules['waterfall']['index']->availableBlocks->waterfallestimate = 'Estimate'; $lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt = 'Plan Gantt Chart'; $lang->block->modules['waterfall']['index']->availableBlocks->waterfallprogress = 'Progress Chart'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue = $lang->executionCommon . ' Issue'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk = $lang->executionCommon . ' Risk'; +$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue = 'Project Issue'; +$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk = 'Project Risk'; $lang->block->modules['waterfall']['index']->availableBlocks->projectdynamic = 'Dynamics'; $lang->block->modules['product'] = new stdclass(); @@ -375,13 +374,13 @@ $lang->block->modules['product']->availableBlocks->story = 'Story'; $lang->block->modules['product']->availableBlocks->plan = 'Plan'; $lang->block->modules['product']->availableBlocks->release = 'Release'; -$lang->block->modules['project'] = new stdclass(); -$lang->block->modules['project']->availableBlocks = new stdclass(); -$lang->block->modules['project']->availableBlocks->statistic = $lang->executionCommon . ' Statistiques'; -$lang->block->modules['project']->availableBlocks->overview = $lang->executionCommon . " Vue d'ensemble"; -$lang->block->modules['project']->availableBlocks->list = $lang->executionCommon . ' Liste'; -$lang->block->modules['project']->availableBlocks->task = 'Tâches'; -$lang->block->modules['project']->availableBlocks->build = 'Build'; +$lang->block->modules['execution'] = new stdclass(); +$lang->block->modules['execution']->availableBlocks = new stdclass(); +$lang->block->modules['execution']->availableBlocks->statistic = $lang->executionCommon . ' Statistiques'; +$lang->block->modules['execution']->availableBlocks->overview = $lang->executionCommon . " Vue d'ensemble"; +$lang->block->modules['execution']->availableBlocks->list = $lang->executionCommon . ' Liste'; +$lang->block->modules['execution']->availableBlocks->task = 'Tâches'; +$lang->block->modules['execution']->availableBlocks->build = 'Build'; $lang->block->modules['qa'] = new stdclass(); $lang->block->modules['qa']->availableBlocks = new stdclass(); @@ -409,6 +408,12 @@ $lang->block->orderByList->project['id_desc'] = 'Tri par ID Projet DESC'; $lang->block->orderByList->project['status_asc'] = 'Tri par Statut ASC'; $lang->block->orderByList->project['status_desc'] = 'Tri par Statut DESC'; +$lang->block->orderByList->execution = array(); +$lang->block->orderByList->execution['id_asc'] = 'Tri par ID Execution ASC'; +$lang->block->orderByList->execution['id_desc'] = 'Tri par ID Execution DESC'; +$lang->block->orderByList->execution['status_asc'] = 'Tri par Statut ASC'; +$lang->block->orderByList->execution['status_desc'] = 'Tri par Statut DESC'; + $lang->block->orderByList->task = array(); $lang->block->orderByList->task['id_asc'] = 'Tri par ID Tâche ASC'; $lang->block->orderByList->task['id_desc'] = 'Tri par ID Tâche DESC'; @@ -478,16 +483,16 @@ $lang->block->typeList->product['closed'] = 'Fermés'; $lang->block->typeList->product['all'] = 'Tous'; $lang->block->typeList->product['involved'] = 'Impliqués'; -$lang->block->typeList->program['undone'] = 'Unfinished'; -$lang->block->typeList->program['doing'] = 'Ongoing'; -$lang->block->typeList->program['all'] = 'All'; -$lang->block->typeList->program['involved'] = 'Involved'; - $lang->block->typeList->project['undone'] = 'Unfinished'; $lang->block->typeList->project['doing'] = 'Ongoing'; $lang->block->typeList->project['all'] = 'All'; $lang->block->typeList->project['involved'] = 'Involved'; +$lang->block->typeList->execution['undone'] = 'Unfinished'; +$lang->block->typeList->execution['doing'] = 'Ongoing'; +$lang->block->typeList->execution['all'] = 'All'; +$lang->block->typeList->execution['involved'] = 'Involved'; + $lang->block->typeList->scrum['undone'] = 'Unfinished'; $lang->block->typeList->scrum['doing'] = 'Ongoing中'; $lang->block->typeList->scrum['all'] = 'All'; @@ -499,27 +504,27 @@ $lang->block->typeList->testtask['blocked'] = 'Bloquées'; $lang->block->typeList->testtask['done'] = 'Jouées'; $lang->block->typeList->testtask['all'] = 'Toutes'; -$lang->block->modules['program']->moreLinkList = new stdclass(); -$lang->block->modules['program']->moreLinkList->recentproject = 'project|prjbrowse|'; -$lang->block->modules['program']->moreLinkList->statistic = 'project|prjbrowse|'; -$lang->block->modules['program']->moreLinkList->project = 'project|prjbrowse|'; -$lang->block->modules['program']->moreLinkList->cmmireport = 'weekly|index|'; -$lang->block->modules['program']->moreLinkList->cmmiestimate = 'workestimation|index|'; -$lang->block->modules['program']->moreLinkList->cmmiissue = 'issue|browse|'; -$lang->block->modules['program']->moreLinkList->cmmirisk = 'risk|browse|'; -$lang->block->modules['program']->moreLinkList->scrumlist = 'project|all|'; -$lang->block->modules['program']->moreLinkList->scrumtest = 'testtask|browse|'; -$lang->block->modules['program']->moreLinkList->scrumproduct = 'product|all|'; -$lang->block->modules['program']->moreLinkList->sprint = 'project|all|'; -$lang->block->modules['program']->moreLinkList->projectdynamic = 'company|dynamic|'; +$lang->block->modules['project']->moreLinkList = new stdclass(); +$lang->block->modules['project']->moreLinkList->recentproject = 'project|browse|'; +$lang->block->modules['project']->moreLinkList->statistic = 'project|browse|'; +$lang->block->modules['project']->moreLinkList->project = 'project|browse|'; +$lang->block->modules['project']->moreLinkList->cmmireport = 'weekly|index|'; +$lang->block->modules['project']->moreLinkList->cmmiestimate = 'workestimation|index|'; +$lang->block->modules['project']->moreLinkList->cmmiissue = 'issue|browse|'; +$lang->block->modules['project']->moreLinkList->cmmirisk = 'risk|browse|'; +$lang->block->modules['project']->moreLinkList->scrumlist = 'project|all|'; +$lang->block->modules['project']->moreLinkList->scrumtest = 'testtask|browse|'; +$lang->block->modules['project']->moreLinkList->scrumproduct = 'product|all|'; +$lang->block->modules['project']->moreLinkList->sprint = 'project|all|'; +$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|'; $lang->block->modules['product']->moreLinkList = new stdclass(); $lang->block->modules['product']->moreLinkList->list = 'product|all|'; $lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s'; -$lang->block->modules['project']->moreLinkList = new stdclass(); -$lang->block->modules['project']->moreLinkList->list = 'project|all|status=%s&project='; -$lang->block->modules['project']->moreLinkList->task = 'my|task|type=%s'; +$lang->block->modules['execution']->moreLinkList = new stdclass(); +$lang->block->modules['execution']->moreLinkList->list = 'execution|all|status=%s&executionID='; +$lang->block->modules['execution']->moreLinkList->task = 'my|task|type=%s'; $lang->block->modules['qa']->moreLinkList = new stdclass(); $lang->block->modules['qa']->moreLinkList->bug = 'my|bug|type=%s'; @@ -541,9 +546,9 @@ $lang->block->welcomeList['19:00'] = 'Bonsoir, %s'; $lang->block->gridOptions[8] = 'Left'; $lang->block->gridOptions[4] = 'Right'; -$lang->block->flowchart = array(); -$lang->block->flowchart['admin'] = array('Administrateur', 'Ajoute Compartiment', 'Ajoute Utilisateurs', 'Administre Privilèges'); -$lang->block->flowchart['product'] = array($lang->productCommon . ' Owner', 'Ajoute ' . $lang->productCommon . '/Modules', 'Ajoute ' . $lang->executionCommon . 's', 'Ajoute Stories', 'Maintient Plans', 'Crée Releases'); -$lang->block->flowchart['project'] = array('Scrum Master', 'Ajoute ' . $lang->executionCommon . 's', 'Constitue Equipes', 'Associe ' . $lang->productCommon . 's', 'Rattache Stories', 'Crée/Affecte Tâches'); -$lang->block->flowchart['dev'] = array('Développeurs', 'Réclament Tâches/Bugs', 'Effectuent Tâches', 'Corrigent Bugs', 'MàJ Statuts', 'Terminent Tâches/Bugs'); -$lang->block->flowchart['tester'] = array('Testeurs', 'Rédigent CasTests', 'Jouent CasTests', 'Détectent Bugs', 'Vérifient Corrections', 'Ferment Bugs'); +$lang->block->flowchart = array(); +$lang->block->flowchart['admin'] = array('Administrateur', 'Ajoute Compartiment', 'Ajoute Utilisateurs', 'Administre Privilèges'); +$lang->block->flowchart['product'] = array($lang->productCommon . ' Owner', 'Ajoute ' . $lang->productCommon . '/Modules', 'Ajoute ' . $lang->executionCommon . 's', 'Ajoute Stories', 'Maintient Plans', 'Crée Releases'); +$lang->block->flowchart['execution'] = array('Scrum Master', 'Ajoute ' . $lang->executionCommon . 's', 'Constitue Equipes', 'Associe ' . $lang->productCommon . 's', 'Rattache Stories', 'Crée/Affecte Tâches'); +$lang->block->flowchart['dev'] = array('Développeurs', 'Réclament Tâches/Bugs', 'Effectuent Tâches', 'Corrigent Bugs', 'MàJ Statuts', 'Terminent Tâches/Bugs'); +$lang->block->flowchart['tester'] = array('Testeurs', 'Rédigent CasTests', 'Jouent CasTests', 'Détectent Bugs', 'Vérifient Corrections', 'Ferment Bugs'); diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php index 58b673803b..3d43c28aac 100644 --- a/module/block/lang/vi.php +++ b/module/block/lang/vi.php @@ -42,7 +42,7 @@ $lang->block->leftToday = 'Việc hôm nay'; $lang->block->myTask = 'Nhiệm vụ'; $lang->block->myStory = 'Câu chuyện'; $lang->block->myBug = 'Bugs'; -$lang->block->myProject = 'Unclosed ' . $lang->executionCommon . 's'; +$lang->block->myExecution = 'Unclosed ' . $lang->executionCommon . 's'; $lang->block->myProduct = 'Unclosed ' . $lang->productCommon . 's'; $lang->block->delayed = 'Tạm ngưng'; $lang->block->noData = 'Không có dữ liệu trên loại báo cáo này.'; @@ -98,71 +98,71 @@ $lang->block->spent = 'Has Been Spent'; $lang->block->budget = 'Budget'; $lang->block->left = 'Residuals'; -$lang->block->default['waterfall']['program']['1']['title'] = 'Project Weekly'; -$lang->block->default['waterfall']['program']['1']['block'] = 'waterfallreport'; -$lang->block->default['waterfall']['program']['1']['source'] = 'program'; -$lang->block->default['waterfall']['program']['1']['grid'] = 8; +$lang->block->default['waterfall']['project']['1']['title'] = 'Project Weekly'; +$lang->block->default['waterfall']['project']['1']['block'] = 'waterfallreport'; +$lang->block->default['waterfall']['project']['1']['source'] = 'project'; +$lang->block->default['waterfall']['project']['1']['grid'] = 8; -$lang->block->default['waterfall']['program']['2']['title'] = 'Estimate'; -$lang->block->default['waterfall']['program']['2']['block'] = 'waterfallestimate'; -$lang->block->default['waterfall']['program']['2']['source'] = 'program'; -$lang->block->default['waterfall']['program']['2']['grid'] = 4; +$lang->block->default['waterfall']['project']['2']['title'] = 'Estimate'; +$lang->block->default['waterfall']['project']['2']['block'] = 'waterfallestimate'; +$lang->block->default['waterfall']['project']['2']['source'] = 'project'; +$lang->block->default['waterfall']['project']['2']['grid'] = 4; -$lang->block->default['waterfall']['program']['3']['title'] = 'Plan Gantt Chart'; -$lang->block->default['waterfall']['program']['3']['block'] = 'waterfallgantt'; -$lang->block->default['waterfall']['program']['3']['source'] = 'program'; -$lang->block->default['waterfall']['program']['3']['grid'] = 8; +$lang->block->default['waterfall']['project']['3']['title'] = 'Plan Gantt Chart'; +$lang->block->default['waterfall']['project']['3']['block'] = 'waterfallgantt'; +$lang->block->default['waterfall']['project']['3']['source'] = 'project'; +$lang->block->default['waterfall']['project']['3']['grid'] = 8; -$lang->block->default['waterfall']['program']['4']['title'] = 'Progress Chart'; -$lang->block->default['waterfall']['program']['4']['block'] = 'waterfallprogress'; -$lang->block->default['waterfall']['program']['4']['grid'] = 4; +$lang->block->default['waterfall']['project']['4']['title'] = 'Progress Chart'; +$lang->block->default['waterfall']['project']['4']['block'] = 'waterfallprogress'; +$lang->block->default['waterfall']['project']['4']['grid'] = 4; -$lang->block->default['waterfall']['program']['5']['title'] = 'Project Issue'; -$lang->block->default['waterfall']['program']['5']['block'] = 'waterfallissue'; -$lang->block->default['waterfall']['program']['5']['source'] = 'program'; -$lang->block->default['waterfall']['program']['5']['grid'] = 8; +$lang->block->default['waterfall']['project']['5']['title'] = 'Project Issue'; +$lang->block->default['waterfall']['project']['5']['block'] = 'waterfallissue'; +$lang->block->default['waterfall']['project']['5']['source'] = 'project'; +$lang->block->default['waterfall']['project']['5']['grid'] = 8; -$lang->block->default['waterfall']['program']['5']['params']['type'] = 'all'; -$lang->block->default['waterfall']['program']['5']['params']['count'] = '15'; -$lang->block->default['waterfall']['program']['5']['params']['orderBy'] = 'id_desc'; +$lang->block->default['waterfall']['project']['5']['params']['type'] = 'all'; +$lang->block->default['waterfall']['project']['5']['params']['count'] = '15'; +$lang->block->default['waterfall']['project']['5']['params']['orderBy'] = 'id_desc'; -$lang->block->default['waterfall']['program']['6']['title'] = 'Dynamic'; -$lang->block->default['waterfall']['program']['6']['block'] = 'dynamic'; -$lang->block->default['waterfall']['program']['6']['grid'] = 4; -$lang->block->default['waterfall']['program']['6']['source'] = ''; +$lang->block->default['waterfall']['project']['6']['title'] = 'Dynamic'; +$lang->block->default['waterfall']['project']['6']['block'] = 'dynamic'; +$lang->block->default['waterfall']['project']['6']['grid'] = 4; +$lang->block->default['waterfall']['project']['6']['source'] = 'project'; -$lang->block->default['waterfall']['program']['7']['title'] = 'Project Risk'; -$lang->block->default['waterfall']['program']['7']['block'] = 'waterfallrisk'; -$lang->block->default['waterfall']['program']['7']['source'] = 'program'; -$lang->block->default['waterfall']['program']['7']['grid'] = 8; +$lang->block->default['waterfall']['project']['7']['title'] = 'Project Risk'; +$lang->block->default['waterfall']['project']['7']['block'] = 'waterfallrisk'; +$lang->block->default['waterfall']['project']['7']['source'] = 'project'; +$lang->block->default['waterfall']['project']['7']['grid'] = 8; -$lang->block->default['waterfall']['program']['7']['params']['type'] = 'all'; -$lang->block->default['waterfall']['program']['7']['params']['count'] = '15'; -$lang->block->default['waterfall']['program']['7']['params']['orderBy'] = 'id_desc'; +$lang->block->default['waterfall']['project']['7']['params']['type'] = 'all'; +$lang->block->default['waterfall']['project']['7']['params']['count'] = '15'; +$lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc'; -$lang->block->default['scrum']['program']['1']['title'] = 'Project Overall'; -$lang->block->default['scrum']['program']['1']['block'] = 'scrumoverall'; -$lang->block->default['scrum']['program']['1']['grid'] = 8; +$lang->block->default['scrum']['project']['1']['title'] = 'Project Overall'; +$lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview'; +$lang->block->default['scrum']['project']['1']['grid'] = 8; -$lang->block->default['scrum']['program']['2']['title'] = 'Project List'; -$lang->block->default['scrum']['program']['2']['block'] = 'scrumlist'; -$lang->block->default['scrum']['program']['2']['grid'] = 8; +$lang->block->default['scrum']['project']['2']['title'] = 'Project List'; +$lang->block->default['scrum']['project']['2']['block'] = 'scrumlist'; +$lang->block->default['scrum']['project']['2']['grid'] = 8; -$lang->block->default['scrum']['program']['3']['title'] = 'Test Version'; -$lang->block->default['scrum']['program']['3']['block'] = 'scrumtest'; -$lang->block->default['scrum']['program']['3']['grid'] = 8; +$lang->block->default['scrum']['project']['3']['title'] = 'Test Version'; +$lang->block->default['scrum']['project']['3']['block'] = 'scrumtest'; +$lang->block->default['scrum']['project']['3']['grid'] = 8; -$lang->block->default['scrum']['program']['3']['params']['type'] = 'all'; -$lang->block->default['scrum']['program']['3']['params']['count'] = '15'; -$lang->block->default['scrum']['program']['3']['params']['orderBy'] = 'id_desc'; +$lang->block->default['scrum']['project']['3']['params']['type'] = 'wait'; +$lang->block->default['scrum']['project']['3']['params']['count'] = '15'; +$lang->block->default['scrum']['project']['3']['params']['orderBy'] = 'id_desc'; -$lang->block->default['scrum']['program']['4']['title'] = 'Project Overview'; -$lang->block->default['scrum']['program']['4']['block'] = 'sprint'; -$lang->block->default['scrum']['program']['4']['grid'] = 4; +$lang->block->default['scrum']['project']['4']['title'] = $lang->executionCommon . ' Overview'; +$lang->block->default['scrum']['project']['4']['block'] = 'sprint'; +$lang->block->default['scrum']['project']['4']['grid'] = 4; -$lang->block->default['scrum']['program']['5']['title'] = 'Dynamic'; -$lang->block->default['scrum']['program']['5']['block'] = 'scrumdynamic'; -$lang->block->default['scrum']['program']['5']['grid'] = 4; +$lang->block->default['scrum']['project']['5']['title'] = 'Dynamic'; +$lang->block->default['scrum']['project']['5']['block'] = 'projectdynamic'; +$lang->block->default['scrum']['project']['5']['grid'] = 4; $lang->block->default['product']['1']['title'] = 'Báo cáo '.$lang->productCommon; $lang->block->default['product']['1']['block'] = 'statistic'; @@ -190,39 +190,39 @@ $lang->block->default['product']['4']['params']['count'] = 15; $lang->block->default['product']['4']['params']['orderBy'] = 'id_desc'; $lang->block->default['product']['4']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['1']['title'] = 'Báo cáo '.$lang->executionCommon; -$lang->block->default['project']['1']['block'] = 'statistic'; -$lang->block->default['project']['1']['grid'] = 8; +$lang->block->default['execution']['1']['title'] = 'Báo cáo '.$lang->executionCommon; +$lang->block->default['execution']['1']['block'] = 'statistic'; +$lang->block->default['execution']['1']['grid'] = 8; -$lang->block->default['project']['1']['params']['type'] = 'all'; -$lang->block->default['project']['1']['params']['count'] = '20'; +$lang->block->default['execution']['1']['params']['type'] = 'all'; +$lang->block->default['execution']['1']['params']['count'] = '20'; -$lang->block->default['project']['2']['title'] = 'Tổng quan '.$lang->executionCommon ; -$lang->block->default['project']['2']['block'] = 'overview'; -$lang->block->default['project']['2']['grid'] = 4; +$lang->block->default['execution']['2']['title'] = 'Tổng quan '.$lang->executionCommon ; +$lang->block->default['execution']['2']['block'] = 'overview'; +$lang->block->default['execution']['2']['grid'] = 4; -$lang->block->default['project']['3']['title'] = 'Kích hoạt ' . $lang->executionCommon; -$lang->block->default['project']['3']['block'] = 'list'; -$lang->block->default['project']['3']['grid'] = 8; +$lang->block->default['execution']['3']['title'] = 'Kích hoạt ' . $lang->executionCommon; +$lang->block->default['execution']['3']['block'] = 'list'; +$lang->block->default['execution']['3']['grid'] = 8; -$lang->block->default['project']['3']['params']['count'] = 15; -$lang->block->default['project']['3']['params']['orderBy'] = 'id_desc'; -$lang->block->default['project']['3']['params']['type'] = 'undone'; +$lang->block->default['execution']['3']['params']['count'] = 15; +$lang->block->default['execution']['3']['params']['orderBy'] = 'id_desc'; +$lang->block->default['execution']['3']['params']['type'] = 'undone'; -$lang->block->default['project']['4']['title'] = 'Nhiệm vụ'; -$lang->block->default['project']['4']['block'] = 'task'; -$lang->block->default['project']['4']['grid'] = 4; +$lang->block->default['execution']['4']['title'] = 'Nhiệm vụ'; +$lang->block->default['execution']['4']['block'] = 'task'; +$lang->block->default['execution']['4']['grid'] = 4; -$lang->block->default['project']['4']['params']['count'] = 15; -$lang->block->default['project']['4']['params']['orderBy'] = 'id_desc'; -$lang->block->default['project']['4']['params']['type'] = 'assignedTo'; +$lang->block->default['execution']['4']['params']['count'] = 15; +$lang->block->default['execution']['4']['params']['orderBy'] = 'id_desc'; +$lang->block->default['execution']['4']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['5']['title'] = 'Build List'; -$lang->block->default['project']['5']['block'] = 'build'; -$lang->block->default['project']['5']['grid'] = 8; +$lang->block->default['execution']['5']['title'] = 'Build List'; +$lang->block->default['execution']['5']['block'] = 'build'; +$lang->block->default['execution']['5']['grid'] = 8; -$lang->block->default['project']['5']['params']['count'] = 15; -$lang->block->default['project']['5']['params']['orderBy'] = 'id_desc'; +$lang->block->default['execution']['5']['params']['count'] = 15; +$lang->block->default['execution']['5']['params']['orderBy'] = 'id_desc'; $lang->block->default['qa']['1']['title'] = 'Báo cáo Test'; $lang->block->default['qa']['1']['block'] = 'statistic'; @@ -253,7 +253,7 @@ $lang->block->default['qa']['3']['params']['type'] = 'assigntome'; $lang->block->default['qa']['4']['title'] = 'Đang đợi bản dựng'; $lang->block->default['qa']['4']['block'] = 'testtask'; -$lang->block->default['qa']['4']['grid'] = 4; +$lang->block->default['qa']['4']['grid'] = 8; $lang->block->default['qa']['4']['params']['count'] = 15; $lang->block->default['qa']['4']['params']['orderBy'] = 'id_desc'; @@ -269,15 +269,15 @@ $lang->block->default['full']['my']['2']['block'] = 'dynamic'; $lang->block->default['full']['my']['2']['grid'] = 4; $lang->block->default['full']['my']['2']['source'] = ''; -$lang->block->default['full']['my']['3']['title'] = 'My Todos'; -$lang->block->default['full']['my']['3']['block'] = 'list'; -$lang->block->default['full']['my']['3']['grid'] = 4; -$lang->block->default['full']['my']['3']['source'] = 'todo'; +$lang->block->default['full']['my']['3']['title'] = 'My Todos'; +$lang->block->default['full']['my']['3']['block'] = 'list'; +$lang->block->default['full']['my']['3']['grid'] = 4; +$lang->block->default['full']['my']['3']['source'] = 'todo'; $lang->block->default['full']['my']['3']['params']['count'] = '20'; $lang->block->default['full']['my']['4']['title'] = 'Project Statistic'; $lang->block->default['full']['my']['4']['block'] = 'statistic'; -$lang->block->default['full']['my']['4']['source'] = 'program'; +$lang->block->default['full']['my']['4']['source'] = 'project'; $lang->block->default['full']['my']['4']['grid'] = 8; $lang->block->default['full']['my']['5']['title'] = 'Personal Contribution'; @@ -287,7 +287,7 @@ $lang->block->default['full']['my']['5']['grid'] = 4; $lang->block->default['full']['my']['6']['title'] = 'Recent Projects'; $lang->block->default['full']['my']['6']['block'] = 'recentproject'; -$lang->block->default['full']['my']['6']['source'] = 'program'; +$lang->block->default['full']['my']['6']['source'] = 'project'; $lang->block->default['full']['my']['6']['grid'] = 8; $lang->block->default['full']['my']['7']['title'] = 'AssignedToMe'; @@ -303,13 +303,13 @@ $lang->block->default['full']['my']['7']['params']['issueNum'] = '20'; $lang->block->default['full']['my']['7']['params']['storyNum'] = '20'; $lang->block->default['full']['my']['8']['title'] = 'Human Input'; -$lang->block->default['full']['my']['8']['block'] = 'programteam'; -$lang->block->default['full']['my']['8']['source'] = 'program'; +$lang->block->default['full']['my']['8']['block'] = 'projectteam'; +$lang->block->default['full']['my']['8']['source'] = 'project'; $lang->block->default['full']['my']['8']['grid'] = 8; $lang->block->default['full']['my']['9']['title'] = 'Project List'; -$lang->block->default['full']['my']['9']['block'] = 'program'; -$lang->block->default['full']['my']['9']['source'] = 'program'; +$lang->block->default['full']['my']['9']['block'] = 'project'; +$lang->block->default['full']['my']['9']['source'] = 'project'; $lang->block->default['full']['my']['9']['grid'] = 8; $lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc'; @@ -319,38 +319,37 @@ $lang->block->count = 'Số'; $lang->block->type = 'Loại'; $lang->block->orderBy = 'Order by'; -$lang->block->availableBlocks = new stdclass(); +$lang->block->availableBlocks = new stdclass(); +$lang->block->availableBlocks->todo = 'Việc của bạn'; +$lang->block->availableBlocks->task = 'Nhiệm vụ'; +$lang->block->availableBlocks->bug = 'Bugs của bạn'; +$lang->block->availableBlocks->case = 'Tình huống của bạn'; +$lang->block->availableBlocks->story = 'Câu chuyện của bạn'; +$lang->block->availableBlocks->product = $lang->productCommon; +$lang->block->availableBlocks->execution = $lang->executionCommon; +$lang->block->availableBlocks->plan = 'Kế hoạch'; +$lang->block->availableBlocks->release = 'Phát hành'; +$lang->block->availableBlocks->build = 'Bản dựng'; +$lang->block->availableBlocks->testtask = 'Yêu cầu'; +$lang->block->availableBlocks->risk = 'My Risks'; +$lang->block->availableBlocks->issue = 'My Issues'; -$lang->block->availableBlocks->todo = 'Việc của bạn'; -$lang->block->availableBlocks->task = 'Nhiệm vụ'; -$lang->block->availableBlocks->bug = 'Bugs của bạn'; -$lang->block->availableBlocks->case = 'Tình huống của bạn'; -$lang->block->availableBlocks->story = 'Câu chuyện của bạn'; -$lang->block->availableBlocks->product = $lang->productCommon; -$lang->block->availableBlocks->project = $lang->executionCommon; -$lang->block->availableBlocks->plan = 'Kế hoạch'; -$lang->block->availableBlocks->release = 'Phát hành'; -$lang->block->availableBlocks->build = 'Bản dựng'; -$lang->block->availableBlocks->testtask = 'Yêu cầu'; -$lang->block->availableBlocks->risk = 'My Risks'; -$lang->block->availableBlocks->issue = 'My Issues'; +$lang->block->moduleList['project'] = 'Project'; +$lang->block->moduleList['product'] = $lang->productCommon; +$lang->block->moduleList['execution'] = $lang->executionCommon; +$lang->block->moduleList['qa'] = 'QA'; +$lang->block->moduleList['todo'] = 'Việc làm'; -$lang->block->moduleList['program'] = 'Project'; -$lang->block->moduleList['product'] = $lang->productCommon; -$lang->block->moduleList['project'] = $lang->executionCommon; -$lang->block->moduleList['qa'] = 'QA'; -$lang->block->moduleList['todo'] = 'Việc làm'; - -$lang->block->modules['program'] = new stdclass(); -$lang->block->modules['program']->availableBlocks = new stdclass(); -$lang->block->modules['program']->availableBlocks->program = $lang->executionCommon . ' List'; -$lang->block->modules['program']->availableBlocks->recentproject = 'Recent ' . $lang->executionCommon; -$lang->block->modules['program']->availableBlocks->statistic = $lang->executionCommon . ' Statistic'; -$lang->block->modules['program']->availableBlocks->programteam = $lang->executionCommon . 'Human Input'; +$lang->block->modules['project'] = new stdclass(); +$lang->block->modules['project']->availableBlocks = new stdclass(); +$lang->block->modules['project']->availableBlocks->project = 'Project List'; +$lang->block->modules['project']->availableBlocks->recentproject = 'Recent Projects'; +$lang->block->modules['project']->availableBlocks->statistic = 'Project Statistic'; +$lang->block->modules['project']->availableBlocks->projectteam = 'ProjectHuman Input'; $lang->block->modules['scrum']['index'] = new stdclass(); $lang->block->modules['scrum']['index']->availableBlocks = new stdclass(); -$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview = $lang->executionCommon . ' Overview'; +$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview = 'Project Overview'; $lang->block->modules['scrum']['index']->availableBlocks->scrumlist = $lang->executionCommon . ' List'; $lang->block->modules['scrum']['index']->availableBlocks->sprint = $lang->executionCommon . ' Overview'; $lang->block->modules['scrum']['index']->availableBlocks->scrumtest = 'Test Version'; @@ -375,13 +374,13 @@ $lang->block->modules['product']->availableBlocks->story = 'Câu chuyện'; $lang->block->modules['product']->availableBlocks->plan = 'Kế hoạch'; $lang->block->modules['product']->availableBlocks->release = 'Phát hành'; -$lang->block->modules['project'] = new stdclass(); -$lang->block->modules['project']->availableBlocks = new stdclass(); -$lang->block->modules['project']->availableBlocks->statistic = $lang->executionCommon . ' thống'; -$lang->block->modules['project']->availableBlocks->overview = $lang->executionCommon . ' xem'; -$lang->block->modules['project']->availableBlocks->list = $lang->executionCommon . ' danh sách'; -$lang->block->modules['project']->availableBlocks->task = 'Nhiệm vụ'; -$lang->block->modules['project']->availableBlocks->build = 'Bản dựng'; +$lang->block->modules['execution'] = new stdclass(); +$lang->block->modules['execution']->availableBlocks = new stdclass(); +$lang->block->modules['execution']->availableBlocks->statistic = $lang->executionCommon . ' thống'; +$lang->block->modules['execution']->availableBlocks->overview = $lang->executionCommon . ' xem'; +$lang->block->modules['execution']->availableBlocks->list = $lang->executionCommon . ' danh sách'; +$lang->block->modules['execution']->availableBlocks->task = 'Nhiệm vụ'; +$lang->block->modules['execution']->availableBlocks->build = 'Bản dựng'; $lang->block->modules['qa'] = new stdclass(); $lang->block->modules['qa']->availableBlocks = new stdclass(); @@ -409,6 +408,12 @@ $lang->block->orderByList->project['id_desc'] = 'ID dự án giảm dần'; $lang->block->orderByList->project['status_asc'] = 'Tình trạng dự án tăng dần'; $lang->block->orderByList->project['status_desc'] = 'Tình trạng dự án giảm dần'; +$lang->block->orderByList->execution = array(); +$lang->block->orderByList->execution['id_asc'] = 'ID dự án tăng dần'; +$lang->block->orderByList->execution['id_desc'] = 'ID dự án giảm dần'; +$lang->block->orderByList->execution['status_asc'] = 'Tình trạng dự án tăng dần'; +$lang->block->orderByList->execution['status_desc'] = 'Tình trạng dự án giảm dần'; + $lang->block->orderByList->task = array(); $lang->block->orderByList->task['id_asc'] = 'ID nhiệm vụ tăng dần'; $lang->block->orderByList->task['id_desc'] = 'ID nhiệm vụ giảm dần'; @@ -478,15 +483,15 @@ $lang->block->typeList->product['closed'] = 'Đã đóng'; $lang->block->typeList->product['all'] = 'Tất cả'; $lang->block->typeList->product['involved'] = 'Liên đới'; -$lang->block->typeList->program['undone'] = 'Unfinished'; -$lang->block->typeList->program['doing'] = 'Ongoing'; -$lang->block->typeList->program['all'] = 'All'; -$lang->block->typeList->program['involved'] = 'Involved'; +$lang->block->typeList->project['undone'] = 'Unfinished'; +$lang->block->typeList->project['doing'] = 'Ongoing'; +$lang->block->typeList->project['all'] = 'All'; +$lang->block->typeList->project['involved'] = 'Involved'; -$lang->block->typeList->project['undone'] = 'Chưa kết thúc'; -$lang->block->typeList->project['doing'] = 'Đang làm'; -$lang->block->typeList->project['all'] = 'Tất cả'; -$lang->block->typeList->project['involved'] = 'Liên đới'; +$lang->block->typeList->execution['undone'] = 'Chưa kết thúc'; +$lang->block->typeList->execution['doing'] = 'Đang làm'; +$lang->block->typeList->execution['all'] = 'Tất cả'; +$lang->block->typeList->execution['involved'] = 'Liên đới'; $lang->block->typeList->scrum['undone'] = 'Unfinished'; $lang->block->typeList->scrum['doing'] = 'Ongoing中'; @@ -499,27 +504,27 @@ $lang->block->typeList->testtask['blocked'] = 'Bị khóa'; $lang->block->typeList->testtask['done'] = 'Hoàn thành'; $lang->block->typeList->testtask['all'] = 'Tất cả'; -$lang->block->modules['program']->moreLinkList = new stdclass(); -$lang->block->modules['program']->moreLinkList->recentproject = 'project|prjbrowse|'; -$lang->block->modules['program']->moreLinkList->statistic = 'project|prjbrowse|'; -$lang->block->modules['program']->moreLinkList->project = 'project|prjbrowse|'; -$lang->block->modules['program']->moreLinkList->cmmireport = 'weekly|index|'; -$lang->block->modules['program']->moreLinkList->cmmiestimate = 'workestimation|index|'; -$lang->block->modules['program']->moreLinkList->cmmiissue = 'issue|browse|'; -$lang->block->modules['program']->moreLinkList->cmmirisk = 'risk|browse|'; -$lang->block->modules['program']->moreLinkList->scrumlist = 'project|all|'; -$lang->block->modules['program']->moreLinkList->scrumtest = 'testtask|browse|'; -$lang->block->modules['program']->moreLinkList->scrumproduct = 'product|all|'; -$lang->block->modules['program']->moreLinkList->sprint = 'project|all|'; -$lang->block->modules['program']->moreLinkList->projectdynamic = 'company|dynamic|'; +$lang->block->modules['project']->moreLinkList = new stdclass(); +$lang->block->modules['project']->moreLinkList->recentproject = 'project|browse|'; +$lang->block->modules['project']->moreLinkList->statistic = 'project|browse|'; +$lang->block->modules['project']->moreLinkList->project = 'project|browse|'; +$lang->block->modules['project']->moreLinkList->cmmireport = 'weekly|index|'; +$lang->block->modules['project']->moreLinkList->cmmiestimate = 'workestimation|index|'; +$lang->block->modules['project']->moreLinkList->cmmiissue = 'issue|browse|'; +$lang->block->modules['project']->moreLinkList->cmmirisk = 'risk|browse|'; +$lang->block->modules['project']->moreLinkList->scrumlist = 'project|all|'; +$lang->block->modules['project']->moreLinkList->scrumtest = 'testtask|browse|'; +$lang->block->modules['project']->moreLinkList->scrumproduct = 'product|all|'; +$lang->block->modules['project']->moreLinkList->sprint = 'project|all|'; +$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|'; $lang->block->modules['product']->moreLinkList = new stdclass(); $lang->block->modules['product']->moreLinkList->list = 'product|all|'; $lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s'; -$lang->block->modules['project']->moreLinkList = new stdclass(); -$lang->block->modules['project']->moreLinkList->list = 'project|all|status=%s&project='; -$lang->block->modules['project']->moreLinkList->task = 'my|task|type=%s'; +$lang->block->modules['execution']->moreLinkList = new stdclass(); +$lang->block->modules['execution']->moreLinkList->list = 'execution|all|status=%s&executionID='; +$lang->block->modules['execution']->moreLinkList->task = 'my|task|type=%s'; $lang->block->modules['qa']->moreLinkList = new stdclass(); $lang->block->modules['qa']->moreLinkList->bug = 'my|bug|type=%s'; @@ -541,9 +546,9 @@ $lang->block->welcomeList['19:00'] = 'Chào buổi tối,
%sblock->gridOptions[8] = 'Trái'; $lang->block->gridOptions[4] = 'Phải'; -$lang->block->flowchart = array(); -$lang->block->flowchart['admin'] = array('Quản trị viên', 'Phòng/ban', 'Người dùng', 'Phân quyền'); -$lang->block->flowchart['product'] = array($lang->productCommon, $lang->productCommon, 'Modules', 'Kế hoạch', 'Câu chuyện', 'Phát hành'); -$lang->block->flowchart['project'] = array('Scrum Master',$lang->executionCommon, 'Đội nhóm', $lang->productCommon, 'Câu chuyện', 'Nhiệm vụ'); -$lang->block->flowchart['dev'] = array('Dev Team', 'Nhiệm vụ/Bugs', 'Tình trạng'); -$lang->block->flowchart['tester'] = array('QA Team', 'Tình huống', 'Báo cáo Bugs', 'Kiểm tra Bugs', 'Đóng Bugs'); +$lang->block->flowchart = array(); +$lang->block->flowchart['admin'] = array('Quản trị viên', 'Phòng/ban', 'Người dùng', 'Phân quyền'); +$lang->block->flowchart['product'] = array($lang->productCommon, $lang->productCommon, 'Modules', 'Kế hoạch', 'Câu chuyện', 'Phát hành'); +$lang->block->flowchart['execution'] = array('Scrum Master',$lang->executionCommon, 'Đội nhóm', $lang->productCommon, 'Câu chuyện', 'Nhiệm vụ'); +$lang->block->flowchart['dev'] = array('Dev Team', 'Nhiệm vụ/Bugs', 'Tình trạng'); +$lang->block->flowchart['tester'] = array('QA Team', 'Tình huống', 'Báo cáo Bugs', 'Kiểm tra Bugs', 'Đóng Bugs'); diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 2e62abff07..f9baf0f45e 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -190,40 +190,6 @@ $lang->block->default['product']['4']['params']['count'] = 15; $lang->block->default['product']['4']['params']['orderBy'] = 'id_desc'; $lang->block->default['product']['4']['params']['type'] = 'assignedTo'; -$lang->block->default['execution']['1']['title'] = $lang->executionCommon . '统计'; -$lang->block->default['execution']['1']['block'] = 'statistic'; -$lang->block->default['execution']['1']['grid'] = 8; - -$lang->block->default['execution']['1']['params']['type'] = 'all'; -$lang->block->default['execution']['1']['params']['count'] = '20'; - -$lang->block->default['execution']['2']['title'] = $lang->executionCommon . '总览'; -$lang->block->default['execution']['2']['block'] = 'overview'; -$lang->block->default['execution']['2']['grid'] = 4; - -$lang->block->default['execution']['3']['title'] = '未关闭的' . $lang->executionCommon; -$lang->block->default['execution']['3']['block'] = 'list'; -$lang->block->default['execution']['3']['grid'] = 8; - -$lang->block->default['execution']['3']['params']['count'] = 15; -$lang->block->default['execution']['3']['params']['orderBy'] = 'id_desc'; -$lang->block->default['execution']['3']['params']['type'] = 'undone'; - -$lang->block->default['execution']['4']['title'] = '指派给我的任务'; -$lang->block->default['execution']['4']['block'] = 'task'; -$lang->block->default['execution']['4']['grid'] = 4; - -$lang->block->default['execution']['4']['params']['count'] = 15; -$lang->block->default['execution']['4']['params']['orderBy'] = 'id_desc'; -$lang->block->default['execution']['4']['params']['type'] = 'assignedTo'; - -$lang->block->default['execution']['5']['title'] = '版本列表'; -$lang->block->default['execution']['5']['block'] = 'build'; -$lang->block->default['execution']['5']['grid'] = 8; - -$lang->block->default['execution']['5']['params']['count'] = 15; -$lang->block->default['execution']['5']['params']['orderBy'] = 'id_desc'; - $lang->block->default['execution']['1']['title'] = '执行统计'; $lang->block->default['execution']['1']['block'] = 'statistic'; $lang->block->default['execution']['1']['grid'] = 8; @@ -303,10 +269,10 @@ $lang->block->default['full']['my']['2']['block'] = 'dynamic'; $lang->block->default['full']['my']['2']['grid'] = 4; $lang->block->default['full']['my']['2']['source'] = ''; -$lang->block->default['full']['my']['3']['title'] = '我的待办'; -$lang->block->default['full']['my']['3']['block'] = 'list'; -$lang->block->default['full']['my']['3']['grid'] = 4; -$lang->block->default['full']['my']['3']['source'] = 'todo'; +$lang->block->default['full']['my']['3']['title'] = '我的待办'; +$lang->block->default['full']['my']['3']['block'] = 'list'; +$lang->block->default['full']['my']['3']['grid'] = 4; +$lang->block->default['full']['my']['3']['source'] = 'todo'; $lang->block->default['full']['my']['3']['params']['count'] = '20'; $lang->block->default['full']['my']['4']['title'] = '项目统计'; @@ -353,7 +319,7 @@ $lang->block->count = '数量'; $lang->block->type = '类型'; $lang->block->orderBy = '排序'; -$lang->block->availableBlocks = new stdclass(); +$lang->block->availableBlocks = new stdclass(); $lang->block->availableBlocks->todo = '我的待办'; $lang->block->availableBlocks->task = '我的任务'; $lang->block->availableBlocks->bug = '我的Bug'; diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index 22d09fd3f1..470331f5cc 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -42,7 +42,7 @@ $lang->block->leftToday = '今天剩餘工作總計'; $lang->block->myTask = '我的任務'; $lang->block->myStory = "我的{$lang->SRCommon}"; $lang->block->myBug = '我的BUG'; -$lang->block->myProject = '未關閉的' . $lang->executionCommon; +$lang->block->myExecution = '未關閉的' . $lang->executionCommon; $lang->block->myProduct = '未關閉的' . $lang->productCommon; $lang->block->delayed = '已延期'; $lang->block->noData = '當前統計類型下暫無數據'; @@ -59,9 +59,9 @@ $lang->block->resolvedRisks = '解決的風險數'; $lang->block->createdIssues = '創建的問題數'; $lang->block->resolvedIssues = '解決的問題數'; $lang->block->createdDocs = '創建的文檔數'; -$lang->block->allProject = '所有' . $lang->executionCommon; -$lang->block->doingProject = '進行中的' . $lang->executionCommon; -$lang->block->finishProject = '累積' . $lang->executionCommon; +$lang->block->allExecutions = '所有' . $lang->executionCommon; +$lang->block->doingExecution = '進行中的' . $lang->executionCommon; +$lang->block->finishExecution = '累積' . $lang->executionCommon; $lang->block->estimatedHours = '預計'; $lang->block->consumedHours = '已消耗'; $lang->block->time = '第'; @@ -98,71 +98,71 @@ $lang->block->spent = '已花費'; $lang->block->budget = '預算'; $lang->block->left = '剩餘'; -$lang->block->default['waterfall']['program']['1']['title'] = '項目周報'; -$lang->block->default['waterfall']['program']['1']['block'] = 'waterfallreport'; -$lang->block->default['waterfall']['program']['1']['source'] = 'program'; -$lang->block->default['waterfall']['program']['1']['grid'] = 8; +$lang->block->default['waterfall']['project']['1']['title'] = '項目周報'; +$lang->block->default['waterfall']['project']['1']['block'] = 'waterfallreport'; +$lang->block->default['waterfall']['project']['1']['source'] = 'project'; +$lang->block->default['waterfall']['project']['1']['grid'] = 8; -$lang->block->default['waterfall']['program']['2']['title'] = '估算'; -$lang->block->default['waterfall']['program']['2']['block'] = 'waterfallestimate'; -$lang->block->default['waterfall']['program']['2']['source'] = 'program'; -$lang->block->default['waterfall']['program']['2']['grid'] = 4; +$lang->block->default['waterfall']['project']['2']['title'] = '估算'; +$lang->block->default['waterfall']['project']['2']['block'] = 'waterfallestimate'; +$lang->block->default['waterfall']['project']['2']['source'] = 'project'; +$lang->block->default['waterfall']['project']['2']['grid'] = 4; -$lang->block->default['waterfall']['program']['3']['title'] = "項目計劃"; -$lang->block->default['waterfall']['program']['3']['block'] = 'waterfallgantt'; -$lang->block->default['waterfall']['program']['3']['source'] = 'program'; -$lang->block->default['waterfall']['program']['3']['grid'] = 8; +$lang->block->default['waterfall']['project']['3']['title'] = "項目計劃"; +$lang->block->default['waterfall']['project']['3']['block'] = 'waterfallgantt'; +$lang->block->default['waterfall']['project']['3']['source'] = 'project'; +$lang->block->default['waterfall']['project']['3']['grid'] = 8; -$lang->block->default['waterfall']['program']['4']['title'] = '到目前為止項目進展趨勢圖'; -$lang->block->default['waterfall']['program']['4']['block'] = 'waterfallprogress'; -$lang->block->default['waterfall']['program']['4']['grid'] = 4; +$lang->block->default['waterfall']['project']['4']['title'] = '到目前為止項目進展趨勢圖'; +$lang->block->default['waterfall']['project']['4']['block'] = 'waterfallprogress'; +$lang->block->default['waterfall']['project']['4']['grid'] = 4; -$lang->block->default['waterfall']['program']['5']['title'] = '項目問題'; -$lang->block->default['waterfall']['program']['5']['block'] = 'waterfallissue'; -$lang->block->default['waterfall']['program']['5']['source'] = 'program'; -$lang->block->default['waterfall']['program']['5']['grid'] = 8; +$lang->block->default['waterfall']['project']['5']['title'] = '項目問題'; +$lang->block->default['waterfall']['project']['5']['block'] = 'waterfallissue'; +$lang->block->default['waterfall']['project']['5']['source'] = 'project'; +$lang->block->default['waterfall']['project']['5']['grid'] = 8; -$lang->block->default['waterfall']['program']['5']['params']['type'] = 'all'; -$lang->block->default['waterfall']['program']['5']['params']['count'] = '15'; -$lang->block->default['waterfall']['program']['5']['params']['orderBy'] = 'id_desc'; +$lang->block->default['waterfall']['project']['5']['params']['type'] = 'all'; +$lang->block->default['waterfall']['project']['5']['params']['count'] = '15'; +$lang->block->default['waterfall']['project']['5']['params']['orderBy'] = 'id_desc'; -$lang->block->default['waterfall']['program']['6']['title'] = '最新動態'; -$lang->block->default['waterfall']['program']['6']['block'] = 'projectdynamic'; -$lang->block->default['waterfall']['program']['6']['grid'] = 4; -$lang->block->default['waterfall']['program']['6']['source'] = 'program'; +$lang->block->default['waterfall']['project']['6']['title'] = '最新動態'; +$lang->block->default['waterfall']['project']['6']['block'] = 'projectdynamic'; +$lang->block->default['waterfall']['project']['6']['grid'] = 4; +$lang->block->default['waterfall']['project']['6']['source'] = 'project'; -$lang->block->default['waterfall']['program']['7']['title'] = '項目風險'; -$lang->block->default['waterfall']['program']['7']['block'] = 'waterfallrisk'; -$lang->block->default['waterfall']['program']['7']['source'] = 'program'; -$lang->block->default['waterfall']['program']['7']['grid'] = 8; +$lang->block->default['waterfall']['project']['7']['title'] = '項目風險'; +$lang->block->default['waterfall']['project']['7']['block'] = 'waterfallrisk'; +$lang->block->default['waterfall']['project']['7']['source'] = 'project'; +$lang->block->default['waterfall']['project']['7']['grid'] = 8; -$lang->block->default['waterfall']['program']['7']['params']['type'] = 'all'; -$lang->block->default['waterfall']['program']['7']['params']['count'] = '15'; -$lang->block->default['waterfall']['program']['7']['params']['orderBy'] = 'id_desc'; +$lang->block->default['waterfall']['project']['7']['params']['type'] = 'all'; +$lang->block->default['waterfall']['project']['7']['params']['count'] = '15'; +$lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc'; -$lang->block->default['scrum']['program']['1']['title'] = '項目整體情況'; -$lang->block->default['scrum']['program']['1']['block'] = 'scrumoverview'; -$lang->block->default['scrum']['program']['1']['grid'] = 8; +$lang->block->default['scrum']['project']['1']['title'] = '項目整體情況'; +$lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview'; +$lang->block->default['scrum']['project']['1']['grid'] = 8; -$lang->block->default['scrum']['program']['2']['title'] = $lang->executionCommon . '列表'; -$lang->block->default['scrum']['program']['2']['block'] = 'scrumlist'; -$lang->block->default['scrum']['program']['2']['grid'] = 8; +$lang->block->default['scrum']['project']['2']['title'] = $lang->executionCommon . '列表'; +$lang->block->default['scrum']['project']['2']['block'] = 'scrumlist'; +$lang->block->default['scrum']['project']['2']['grid'] = 8; -$lang->block->default['scrum']['program']['3']['title'] = '待測版本'; -$lang->block->default['scrum']['program']['3']['block'] = 'scrumtest'; -$lang->block->default['scrum']['program']['3']['grid'] = 8; +$lang->block->default['scrum']['project']['3']['title'] = '待測版本'; +$lang->block->default['scrum']['project']['3']['block'] = 'scrumtest'; +$lang->block->default['scrum']['project']['3']['grid'] = 8; -$lang->block->default['scrum']['program']['3']['params']['type'] = 'wait'; -$lang->block->default['scrum']['program']['3']['params']['count'] = '15'; -$lang->block->default['scrum']['program']['3']['params']['orderBy'] = 'id_desc'; +$lang->block->default['scrum']['project']['3']['params']['type'] = 'wait'; +$lang->block->default['scrum']['project']['3']['params']['count'] = '15'; +$lang->block->default['scrum']['project']['3']['params']['orderBy'] = 'id_desc'; -$lang->block->default['scrum']['program']['4']['title'] = $lang->executionCommon . '總覽'; -$lang->block->default['scrum']['program']['4']['block'] = 'sprint'; -$lang->block->default['scrum']['program']['4']['grid'] = 4; +$lang->block->default['scrum']['project']['4']['title'] = $lang->executionCommon . '總覽'; +$lang->block->default['scrum']['project']['4']['block'] = 'sprint'; +$lang->block->default['scrum']['project']['4']['grid'] = 4; -$lang->block->default['scrum']['program']['5']['title'] = '最新動態'; -$lang->block->default['scrum']['program']['5']['block'] = 'projectdynamic'; -$lang->block->default['scrum']['program']['5']['grid'] = 4; +$lang->block->default['scrum']['project']['5']['title'] = '最新動態'; +$lang->block->default['scrum']['project']['5']['block'] = 'projectdynamic'; +$lang->block->default['scrum']['project']['5']['grid'] = 4; $lang->block->default['product']['1']['title'] = $lang->productCommon . '統計'; $lang->block->default['product']['1']['block'] = 'statistic'; @@ -190,39 +190,39 @@ $lang->block->default['product']['4']['params']['count'] = 15; $lang->block->default['product']['4']['params']['orderBy'] = 'id_desc'; $lang->block->default['product']['4']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['1']['title'] = $lang->executionCommon . '統計'; -$lang->block->default['project']['1']['block'] = 'statistic'; -$lang->block->default['project']['1']['grid'] = 8; +$lang->block->default['execution']['1']['title'] = '執行統計'; +$lang->block->default['execution']['1']['block'] = 'statistic'; +$lang->block->default['execution']['1']['grid'] = 8; -$lang->block->default['project']['1']['params']['type'] = 'all'; -$lang->block->default['project']['1']['params']['count'] = '20'; +$lang->block->default['execution']['1']['params']['type'] = 'all'; +$lang->block->default['execution']['1']['params']['count'] = '20'; -$lang->block->default['project']['2']['title'] = $lang->executionCommon . '總覽'; -$lang->block->default['project']['2']['block'] = 'overview'; -$lang->block->default['project']['2']['grid'] = 4; +$lang->block->default['execution']['2']['title'] = '執行總覽'; +$lang->block->default['execution']['2']['block'] = 'overview'; +$lang->block->default['execution']['2']['grid'] = 4; -$lang->block->default['project']['3']['title'] = '未關閉的' . $lang->executionCommon; -$lang->block->default['project']['3']['block'] = 'list'; -$lang->block->default['project']['3']['grid'] = 8; +$lang->block->default['execution']['3']['title'] = '未關閉的執行'; +$lang->block->default['execution']['3']['block'] = 'list'; +$lang->block->default['execution']['3']['grid'] = 8; -$lang->block->default['project']['3']['params']['count'] = 15; -$lang->block->default['project']['3']['params']['orderBy'] = 'id_desc'; -$lang->block->default['project']['3']['params']['type'] = 'undone'; +$lang->block->default['execution']['3']['params']['count'] = 15; +$lang->block->default['execution']['3']['params']['orderBy'] = 'id_desc'; +$lang->block->default['execution']['3']['params']['type'] = 'undone'; -$lang->block->default['project']['4']['title'] = '指派給我的任務'; -$lang->block->default['project']['4']['block'] = 'task'; -$lang->block->default['project']['4']['grid'] = 4; +$lang->block->default['execution']['4']['title'] = '指派給我的任務'; +$lang->block->default['execution']['4']['block'] = 'task'; +$lang->block->default['execution']['4']['grid'] = 4; -$lang->block->default['project']['4']['params']['count'] = 15; -$lang->block->default['project']['4']['params']['orderBy'] = 'id_desc'; -$lang->block->default['project']['4']['params']['type'] = 'assignedTo'; +$lang->block->default['execution']['4']['params']['count'] = 15; +$lang->block->default['execution']['4']['params']['orderBy'] = 'id_desc'; +$lang->block->default['execution']['4']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['5']['title'] = '版本列表'; -$lang->block->default['project']['5']['block'] = 'build'; -$lang->block->default['project']['5']['grid'] = 8; +$lang->block->default['execution']['5']['title'] = '版本列表'; +$lang->block->default['execution']['5']['block'] = 'build'; +$lang->block->default['execution']['5']['grid'] = 8; -$lang->block->default['project']['5']['params']['count'] = 15; -$lang->block->default['project']['5']['params']['orderBy'] = 'id_desc'; +$lang->block->default['execution']['5']['params']['count'] = 15; +$lang->block->default['execution']['5']['params']['orderBy'] = 'id_desc'; $lang->block->default['qa']['1']['title'] = '測試統計'; $lang->block->default['qa']['1']['block'] = 'statistic'; @@ -269,15 +269,15 @@ $lang->block->default['full']['my']['2']['block'] = 'dynamic'; $lang->block->default['full']['my']['2']['grid'] = 4; $lang->block->default['full']['my']['2']['source'] = ''; -$lang->block->default['full']['my']['3']['title'] = '我的待辦'; -$lang->block->default['full']['my']['3']['block'] = 'list'; -$lang->block->default['full']['my']['3']['grid'] = 4; -$lang->block->default['full']['my']['3']['source'] = 'todo'; +$lang->block->default['full']['my']['3']['title'] = '我的待辦'; +$lang->block->default['full']['my']['3']['block'] = 'list'; +$lang->block->default['full']['my']['3']['grid'] = 4; +$lang->block->default['full']['my']['3']['source'] = 'todo'; $lang->block->default['full']['my']['3']['params']['count'] = '20'; $lang->block->default['full']['my']['4']['title'] = '項目統計'; $lang->block->default['full']['my']['4']['block'] = 'statistic'; -$lang->block->default['full']['my']['4']['source'] = 'program'; +$lang->block->default['full']['my']['4']['source'] = 'project'; $lang->block->default['full']['my']['4']['grid'] = 8; $lang->block->default['full']['my']['5']['title'] = '我的貢獻'; @@ -287,7 +287,7 @@ $lang->block->default['full']['my']['5']['grid'] = 4; $lang->block->default['full']['my']['6']['title'] = '我近期參與的項目'; $lang->block->default['full']['my']['6']['block'] = 'recentproject'; -$lang->block->default['full']['my']['6']['source'] = 'program'; +$lang->block->default['full']['my']['6']['source'] = 'project'; $lang->block->default['full']['my']['6']['grid'] = 8; $lang->block->default['full']['my']['7']['title'] = '指派給我'; @@ -303,13 +303,13 @@ $lang->block->default['full']['my']['7']['params']['issueNum'] = '20'; $lang->block->default['full']['my']['7']['params']['storyNum'] = '20'; $lang->block->default['full']['my']['8']['title'] = '項目人力投入'; -$lang->block->default['full']['my']['8']['block'] = 'programteam'; -$lang->block->default['full']['my']['8']['source'] = 'program'; +$lang->block->default['full']['my']['8']['block'] = 'projectteam'; +$lang->block->default['full']['my']['8']['source'] = 'project'; $lang->block->default['full']['my']['8']['grid'] = 8; $lang->block->default['full']['my']['9']['title'] = '項目列表'; -$lang->block->default['full']['my']['9']['block'] = 'program'; -$lang->block->default['full']['my']['9']['source'] = 'program'; +$lang->block->default['full']['my']['9']['block'] = 'project'; +$lang->block->default['full']['my']['9']['source'] = 'project'; $lang->block->default['full']['my']['9']['grid'] = 8; $lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc'; @@ -319,34 +319,33 @@ $lang->block->count = '數量'; $lang->block->type = '類型'; $lang->block->orderBy = '排序'; -$lang->block->availableBlocks = new stdclass(); +$lang->block->availableBlocks = new stdclass(); +$lang->block->availableBlocks->todo = '我的待辦'; +$lang->block->availableBlocks->task = '我的任務'; +$lang->block->availableBlocks->bug = '我的Bug'; +$lang->block->availableBlocks->case = '我的用例'; +$lang->block->availableBlocks->story = "我的{$lang->SRCommon}"; +$lang->block->availableBlocks->product = $lang->productCommon . '列表'; +$lang->block->availableBlocks->execution = $lang->executionCommon . '列表'; +$lang->block->availableBlocks->plan = "計劃列表"; +$lang->block->availableBlocks->release = '發佈列表'; +$lang->block->availableBlocks->build = '版本列表'; +$lang->block->availableBlocks->testtask = '測試版本列表'; +$lang->block->availableBlocks->risk = '我的風險'; +$lang->block->availableBlocks->issue = '我的問題'; -$lang->block->availableBlocks->todo = '我的待辦'; -$lang->block->availableBlocks->task = '我的任務'; -$lang->block->availableBlocks->bug = '我的Bug'; -$lang->block->availableBlocks->case = '我的用例'; -$lang->block->availableBlocks->story = "我的{$lang->SRCommon}"; -$lang->block->availableBlocks->product = $lang->productCommon . '列表'; -$lang->block->availableBlocks->project = $lang->executionCommon . '列表'; -$lang->block->availableBlocks->plan = "計劃列表"; -$lang->block->availableBlocks->release = '發佈列表'; -$lang->block->availableBlocks->build = '版本列表'; -$lang->block->availableBlocks->testtask = '測試版本列表'; -$lang->block->availableBlocks->risk = '我的風險'; -$lang->block->availableBlocks->issue = '我的問題'; +$lang->block->moduleList['project'] = '項目'; +$lang->block->moduleList['product'] = $lang->productCommon; +$lang->block->moduleList['execution'] = $lang->executionCommon; +$lang->block->moduleList['qa'] = '測試'; +$lang->block->moduleList['todo'] = '待辦'; -$lang->block->moduleList['program'] = '項目'; -$lang->block->moduleList['product'] = $lang->productCommon; -$lang->block->moduleList['project'] = $lang->executionCommon; -$lang->block->moduleList['qa'] = '測試'; -$lang->block->moduleList['todo'] = '待辦'; - -$lang->block->modules['program'] = new stdclass(); -$lang->block->modules['program']->availableBlocks = new stdclass(); -$lang->block->modules['program']->availableBlocks->program = '項目列表'; -$lang->block->modules['program']->availableBlocks->recentproject = '近期項目'; -$lang->block->modules['program']->availableBlocks->statistic = '項目統計'; -$lang->block->modules['program']->availableBlocks->programteam = '項目人力投入'; +$lang->block->modules['project'] = new stdclass(); +$lang->block->modules['project']->availableBlocks = new stdclass(); +$lang->block->modules['project']->availableBlocks->project = '項目列表'; +$lang->block->modules['project']->availableBlocks->recentproject = '近期項目'; +$lang->block->modules['project']->availableBlocks->statistic = '項目統計'; +$lang->block->modules['project']->availableBlocks->projectteam = '項目人力投入'; $lang->block->modules['scrum']['index'] = new stdclass(); $lang->block->modules['scrum']['index']->availableBlocks = new stdclass(); @@ -375,13 +374,13 @@ $lang->block->modules['product']->availableBlocks->story = "{$lang->SRCommon $lang->block->modules['product']->availableBlocks->plan = "計劃列表"; $lang->block->modules['product']->availableBlocks->release = '發佈列表'; -$lang->block->modules['project'] = new stdclass(); -$lang->block->modules['project']->availableBlocks = new stdclass(); -$lang->block->modules['project']->availableBlocks->statistic = $lang->executionCommon . '統計'; -$lang->block->modules['project']->availableBlocks->overview = $lang->executionCommon . '總覽'; -$lang->block->modules['project']->availableBlocks->list = $lang->executionCommon . '列表'; -$lang->block->modules['project']->availableBlocks->task = '任務列表'; -$lang->block->modules['project']->availableBlocks->build = '版本列表'; +$lang->block->modules['execution'] = new stdclass(); +$lang->block->modules['execution']->availableBlocks = new stdclass(); +$lang->block->modules['execution']->availableBlocks->statistic = $lang->executionCommon . '統計'; +$lang->block->modules['execution']->availableBlocks->overview = $lang->executionCommon . '總覽'; +$lang->block->modules['execution']->availableBlocks->list = $lang->executionCommon . '列表'; +$lang->block->modules['execution']->availableBlocks->task = '任務列表'; +$lang->block->modules['execution']->availableBlocks->build = '版本列表'; $lang->block->modules['qa'] = new stdclass(); $lang->block->modules['qa']->availableBlocks = new stdclass(); @@ -409,6 +408,12 @@ $lang->block->orderByList->project['id_desc'] = 'ID 遞減'; $lang->block->orderByList->project['status_asc'] = '狀態正序'; $lang->block->orderByList->project['status_desc'] = '狀態倒序'; +$lang->block->orderByList->execution = array(); +$lang->block->orderByList->execution['id_asc'] = 'ID 遞增'; +$lang->block->orderByList->execution['id_desc'] = 'ID 遞減'; +$lang->block->orderByList->execution['status_asc'] = '狀態正序'; +$lang->block->orderByList->execution['status_desc'] = '狀態倒序'; + $lang->block->orderByList->task = array(); $lang->block->orderByList->task['id_asc'] = 'ID 遞增'; $lang->block->orderByList->task['id_desc'] = 'ID 遞減'; @@ -478,15 +483,15 @@ $lang->block->typeList->product['closed'] = '已關閉'; $lang->block->typeList->product['all'] = '全部'; $lang->block->typeList->product['involved'] = '我參與'; -$lang->block->typeList->program['undone'] = '未完成'; -$lang->block->typeList->program['doing'] = '進行中'; -$lang->block->typeList->program['all'] = '全部'; -$lang->block->typeList->program['involved'] = '我參與的'; - $lang->block->typeList->project['undone'] = '未完成'; $lang->block->typeList->project['doing'] = '進行中'; $lang->block->typeList->project['all'] = '全部'; -$lang->block->typeList->project['involved'] = '我參與'; +$lang->block->typeList->project['involved'] = '我參與的'; + +$lang->block->typeList->execution['undone'] = '未完成'; +$lang->block->typeList->execution['doing'] = '進行中'; +$lang->block->typeList->execution['all'] = '全部'; +$lang->block->typeList->execution['involved'] = '我參與'; $lang->block->typeList->scrum['undone'] = '未完成'; $lang->block->typeList->scrum['doing'] = '進行中'; @@ -499,27 +504,27 @@ $lang->block->typeList->testtask['blocked'] = '阻塞版本'; $lang->block->typeList->testtask['done'] = '已測版本'; $lang->block->typeList->testtask['all'] = '全部'; -$lang->block->modules['program']->moreLinkList = new stdclass(); -$lang->block->modules['program']->moreLinkList->recentproject = 'project|prjbrowse|'; -$lang->block->modules['program']->moreLinkList->statistic = 'project|prjbrowse|'; -$lang->block->modules['program']->moreLinkList->project = 'project|prjbrowse|'; -$lang->block->modules['program']->moreLinkList->cmmireport = 'weekly|index|'; -$lang->block->modules['program']->moreLinkList->cmmiestimate = 'workestimation|index|'; -$lang->block->modules['program']->moreLinkList->cmmiissue = 'issue|browse|'; -$lang->block->modules['program']->moreLinkList->cmmirisk = 'risk|browse|'; -$lang->block->modules['program']->moreLinkList->scrumlist = 'project|all|'; -$lang->block->modules['program']->moreLinkList->scrumtest = 'testtask|browse|'; -$lang->block->modules['program']->moreLinkList->scrumproduct = 'product|all|'; -$lang->block->modules['program']->moreLinkList->sprint = 'project|all|'; -$lang->block->modules['program']->moreLinkList->projectdynamic = 'company|dynamic|'; +$lang->block->modules['project']->moreLinkList = new stdclass(); +$lang->block->modules['project']->moreLinkList->recentproject = 'project|browse|'; +$lang->block->modules['project']->moreLinkList->statistic = 'project|browse|'; +$lang->block->modules['project']->moreLinkList->project = 'project|browse|'; +$lang->block->modules['project']->moreLinkList->cmmireport = 'weekly|index|'; +$lang->block->modules['project']->moreLinkList->cmmiestimate = 'workestimation|index|'; +$lang->block->modules['project']->moreLinkList->cmmiissue = 'issue|browse|'; +$lang->block->modules['project']->moreLinkList->cmmirisk = 'risk|browse|'; +$lang->block->modules['project']->moreLinkList->scrumlist = 'project|all|'; +$lang->block->modules['project']->moreLinkList->scrumtest = 'testtask|browse|'; +$lang->block->modules['project']->moreLinkList->scrumproduct = 'product|all|'; +$lang->block->modules['project']->moreLinkList->sprint = 'project|all|'; +$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|'; $lang->block->modules['product']->moreLinkList = new stdclass(); $lang->block->modules['product']->moreLinkList->list = 'product|all|'; $lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s'; -$lang->block->modules['project']->moreLinkList = new stdclass(); -$lang->block->modules['project']->moreLinkList->list = 'project|all|status=%s&project='; -$lang->block->modules['project']->moreLinkList->task = 'my|task|type=%s'; +$lang->block->modules['execution']->moreLinkList = new stdclass(); +$lang->block->modules['execution']->moreLinkList->list = 'execution|all|status=%s&executionID='; +$lang->block->modules['execution']->moreLinkList->task = 'my|task|type=%s'; $lang->block->modules['qa']->moreLinkList = new stdclass(); $lang->block->modules['qa']->moreLinkList->bug = 'my|bug|type=%s'; @@ -541,9 +546,9 @@ $lang->block->welcomeList['19:00'] = '%s，晚上好！'; $lang->block->gridOptions[8] = '左側'; $lang->block->gridOptions[4] = '右側'; -$lang->block->flowchart = array(); -$lang->block->flowchart['admin'] = array('管理員', '維護公司', '添加用戶', '維護權限'); -$lang->block->flowchart['product'] = array($lang->productCommon . '經理', '創建' . $lang->productCommon, '維護模組', "維護計劃", "維護{$lang->SRCommon}", '創建發佈'); -$lang->block->flowchart['project'] = array($lang->executionCommon . '經理', '創建' . $lang->executionCommon, '維護團隊', '關聯' . $lang->productCommon, "關聯{$lang->SRCommon}", '分解任務'); -$lang->block->flowchart['dev'] = array('研發人員', '領取任務和Bug', '更新狀態', '完成任務和Bug'); -$lang->block->flowchart['tester'] = array('測試人員', '撰寫用例', '執行用例', '提交Bug', '驗證Bug', '關閉Bug'); +$lang->block->flowchart = array(); +$lang->block->flowchart['admin'] = array('管理員', '維護公司', '添加用戶', '維護權限'); +$lang->block->flowchart['product'] = array($lang->productCommon . '經理', '創建' . $lang->productCommon, '維護模組', "維護計劃", "維護{$lang->SRCommon}", '創建發佈'); +$lang->block->flowchart['execution'] = array($lang->executionCommon . '經理', '創建' . $lang->executionCommon, '維護團隊', '關聯' . $lang->productCommon, "關聯{$lang->SRCommon}", '分解任務'); +$lang->block->flowchart['dev'] = array('研發人員', '領取任務和Bug', '更新狀態', '完成任務和Bug'); +$lang->block->flowchart['tester'] = array('測試人員', '撰寫用例', '執行用例', '提交Bug', '驗證Bug', '關閉Bug'); From 33bcb0922e60d1a8bbc057a39025c32db784f4d6 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Tue, 9 Mar 2021 17:28:23 +0800 Subject: [PATCH 09/11] * Finish task #36438. --- module/block/view/storyblock.html.php | 2 +- module/block/view/taskblock.html.php | 2 +- module/block/view/waterfallissueblock.html.php | 4 ++-- module/build/view/linkstory.html.php | 4 ++-- module/build/view/view.html.php | 14 +++++++------- module/execution/css/task.css | 3 +++ module/execution/view/grouptask.html.php | 4 ++-- module/execution/view/linkstory.html.php | 6 +++--- module/execution/view/story.html.php | 4 ++-- module/my/css/common.css | 1 + module/product/css/common.css | 5 +++-- module/product/view/project.html.php | 8 ++++---- module/productplan/view/linkstory.html.php | 8 ++++---- module/productplan/view/view.html.php | 4 ++-- module/projectrelease/control.php | 2 +- module/projectrelease/view/linkstory.html.php | 12 ++++++------ module/projectrelease/view/view.html.php | 14 +++++++------- module/release/view/linkstory.html.php | 12 ++++++------ module/release/view/view.html.php | 14 +++++++------- module/story/view/linkstory.html.php | 6 +++--- module/story/view/view.html.php | 4 ++-- module/task/config.php | 2 +- 22 files changed, 70 insertions(+), 65 deletions(-) diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php index d4b5a745f5..c26ecfef5e 100644 --- a/module/block/view/storyblock.html.php +++ b/module/block/view/storyblock.html.php @@ -16,7 +16,7 @@ diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index 35697f18d6..0c2a4cf2f9 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -12,6 +12,8 @@ ?> +recTotal);?> +rawMethod);?> testtask->confirmDelete)?>