diff --git a/module/execution/control.php b/module/execution/control.php index 997d4abac6..31878e9419 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1182,7 +1182,10 @@ class execution extends control { if($this->app->openApp == 'project') { - commonModel::setAppObjectID('project', $projectID); + $project = $this->project->getByID($projectID); + $model = $project->model; + $this->lang->project->menu = $this->lang->menu->$model; + commonModel::setAppobjectID('project', $projectID); } $this->app->loadLang('program'); @@ -1299,6 +1302,7 @@ class execution extends control $this->view->copyExecutionID = $copyExecutionID; $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products)); $this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed'); + $this->view->from = $this->app->openApp; $this->display(); } diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 606ec00d14..c96bdb838d 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -10,6 +10,7 @@ * @link http://www.zentao.net */ /* Fields. */ +$lang->executionCommon = $lang->executionCommon; $lang->execution->common = $lang->executionCommon; $lang->execution->allExecutions = 'Alle'; $lang->execution->id = $lang->executionCommon . ' ID'; @@ -17,6 +18,9 @@ $lang->execution->type = 'Typ'; $lang->execution->name = 'Name'; $lang->execution->code = 'Alias'; $lang->execution->project = 'Project'; +$lang->execution->execName = 'Execution Name'; +$lang->execution->execCode = 'Execution Code'; +$lang->execution->execType = 'Execution Type'; $lang->execution->statge = 'Stage'; $lang->execution->pri = 'Priorität'; $lang->execution->openedBy = 'OpenedBy'; @@ -36,12 +40,14 @@ $lang->execution->workHourUnit = 'H'; $lang->execution->totalHours = 'Arbeitsstunden'; $lang->execution->totalDays = 'Arbeitstage'; $lang->execution->status = 'Status'; +$lang->execution->execStatus = 'Status'; $lang->execution->subStatus = 'Sub Status'; $lang->execution->desc = 'Beschreibung'; +$lang->execution->execDesc = 'Description'; $lang->execution->owner = 'Besitzer'; $lang->execution->PO = 'PO'; $lang->execution->PM = 'PM'; -$lang->execution->QD = 'QS Manager'; +$lang->execution->QD = 'Test Manager'; $lang->execution->RD = 'Release Manager'; $lang->execution->release = 'Release'; $lang->execution->acl = 'Zugriffskontrolle'; @@ -66,6 +72,7 @@ $lang->execution->undone = 'Unabgeschlossen '; $lang->execution->unclosed = 'Geschlossen'; $lang->execution->typeDesc = "Keine {$lang->SRCommon}, Bug, Build, Testaufgabe oder ist bei OPS erlaubt"; $lang->execution->mine = 'Meine Zuständigkeit: '; +$lang->execution->involved = 'Mine: '; $lang->execution->other = 'Andere:'; $lang->execution->deleted = 'Gelöscht'; $lang->execution->delayed = 'Verspätet'; @@ -98,6 +105,10 @@ $lang->execution->endList[93] = '3 Monate'; $lang->execution->endList[186] = '6 Monate'; $lang->execution->endList[365] = '1 Jahr'; +$lang->execution->lifeTimeList['short'] = "Short-Term"; +$lang->execution->lifeTimeList['long'] = "Long-Term"; +$lang->execution->lifeTimeList['ops'] = "DevOps"; + $lang->team = new stdclass(); $lang->team->account = 'Konto'; $lang->team->role = 'Rolle'; @@ -144,6 +155,7 @@ $lang->execution->groupTask = 'Nach Gruppen'; $lang->execution->story = 'Storys'; $lang->execution->qa = 'QA'; $lang->execution->bug = 'Bugs'; +$lang->execution->testcase = 'Testcase List'; $lang->execution->dynamic = 'Verlauf'; $lang->execution->latestDynamic = 'Letzter Verlauf'; $lang->execution->build = 'Builds'; @@ -176,6 +188,8 @@ $lang->execution->treeAction = "{$lang->executionCommon} Tree View"; $lang->execution->exportAction = "Export {$lang->executionCommon}"; $lang->execution->computeBurnAction = "Compute Burn"; $lang->execution->create = "Erstelle Projekt"; +$lang->execution->createExec = "Create Execution"; +$lang->execution->copyExec = "Copy Execution"; $lang->execution->copy = "Kopiere {$lang->executionCommon}"; $lang->execution->delete = "Lösche"; $lang->execution->browse = "Durchsuchen"; @@ -244,8 +258,6 @@ $lang->execution->linkStoryByPlanTips = "This action will link all stories in th $lang->execution->selectExecution = "Auswahl {$lang->executionCommon}"; $lang->execution->selectExecution = "Select Execution"; $lang->execution->beginAndEnd = 'Dauer'; -$lang->execution->begin = 'Start'; -$lang->execution->end = 'Ende'; $lang->execution->lblStats = 'Mannstunden Summe(h) : '; $lang->execution->stats = '%s Verfügbar, %s geplant, %s genutzt, %s Rest.'; $lang->execution->taskSummary = "Aufgaben auf dieser Seite: %s Total, %s Wartend, %s In Arbeit; Stunden : %s geplant., %s genutzt, %s Rest."; @@ -304,12 +316,7 @@ $lang->execution->fixFirstWithLeft = 'Modify the left'; $lang->execution->unfinishedExecution = "This {$lang->executionCommon} has "; $lang->execution->unfinishedTask = "[%s] unfinished tasks. "; $lang->execution->unresolvedBug = "[%s] unresolved bugs. "; - -$lang->execution->action = new stdclass(); -$lang->execution->action->opened = '$date, created by $actor . $extra' . "\n"; -$lang->execution->action->managed = '$date, managed by $actor . $extra' . "\n"; -$lang->execution->action->edited = '$date, edited by $actor . $extra' . "\n"; -$lang->execution->action->extra = "The linked {$lang->productCommon}s are %s."; +$lang->execution->projectNotEmpty = 'Project cannot be empty.'; /* 统计。*/ $lang->execution->charts = new stdclass(); diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 1197780bdd..95f7b7ed80 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -10,13 +10,17 @@ * @link http://www.zentao.net */ /* Fields. */ -$lang->executionCommon = $lang->executionCommon; +$lang->executionCommon = $lang->executionCommon; +$lang->execution->common = 'Execution'; $lang->execution->allExecutions = 'All ' . $lang->executionCommon . 's'; $lang->execution->id = $lang->executionCommon . ' ID'; $lang->execution->type = 'Type'; $lang->execution->name = "{$lang->executionCommon} Name"; $lang->execution->code = 'Code'; $lang->execution->project = 'Project'; +$lang->execution->execName = 'Execution Name'; +$lang->execution->execCode = 'Execution Code'; +$lang->execution->execType = 'Execution Type'; $lang->execution->statge = 'Stage'; $lang->execution->pri = 'Priority'; $lang->execution->openedBy = 'OpenedBy'; @@ -36,8 +40,10 @@ $lang->execution->workHourUnit = 'H'; $lang->execution->totalHours = 'Available Hours'; $lang->execution->totalDays = 'Available Days'; $lang->execution->status = 'Status'; +$lang->execution->execStatus = 'Status'; $lang->execution->subStatus = 'Sub Status'; $lang->execution->desc = 'Description'; +$lang->execution->execDesc = 'Description'; $lang->execution->owner = 'Owner'; $lang->execution->PO = "{$lang->executionCommon} Owner"; $lang->execution->PM = "{$lang->executionCommon} Manager"; @@ -66,6 +72,7 @@ $lang->execution->undone = 'Unfinished '; $lang->execution->unclosed = 'Unclosed'; $lang->execution->typeDesc = "OPS {$lang->executionCommon} has no {$lang->SRCommon}, Bug, Build, or Test features."; $lang->execution->mine = 'Mine: '; +$lang->execution->involved = 'Mine: '; $lang->execution->other = 'Others:'; $lang->execution->deleted = 'Deleted'; $lang->execution->delayed = 'Delayed'; @@ -148,6 +155,7 @@ $lang->execution->groupTask = 'Group View'; $lang->execution->story = 'Story List'; $lang->execution->qa = 'QA'; $lang->execution->bug = 'Bug List'; +$lang->execution->testcase = 'Testcase List'; $lang->execution->dynamic = 'Dynamics'; $lang->execution->latestDynamic = 'Dynamics'; $lang->execution->build = 'Build List'; @@ -180,7 +188,8 @@ $lang->execution->treeAction = "{$lang->executionCommon} Tree View"; $lang->execution->exportAction = "Export {$lang->executionCommon}"; $lang->execution->computeBurnAction = "Update Burndown"; $lang->execution->create = "Create {$lang->executionCommon}"; -$lang->execution->createExec = "Create execution"; +$lang->execution->createExec = "Create Execution"; +$lang->execution->copyExec = "Copy Execution"; $lang->execution->copy = "Copy {$lang->executionCommon}"; $lang->execution->delete = "Delete {$lang->executionCommon}"; $lang->execution->browse = "{$lang->executionCommon} List"; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index ea88a51a18..f6357cf0dc 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -10,12 +10,17 @@ * @link https://www.zentao.pm */ /* Fields. */ +$lang->executionCommon = $lang->executionCommon; $lang->execution->common = $lang->executionCommon; $lang->execution->allExecutions = 'Tous les ' . $lang->executionCommon . 's'; $lang->execution->id = $lang->executionCommon . ' ID'; $lang->execution->type = 'Type'; $lang->execution->name = "Nom du {$lang->executionCommon}"; $lang->execution->code = 'Code'; +$lang->execution->project = 'Project'; +$lang->execution->execName = 'Execution Name'; +$lang->execution->execCode = 'Execution Code'; +$lang->execution->execType = 'Execution Type'; $lang->execution->statge = 'Etape'; $lang->execution->pri = 'Priorité'; $lang->execution->openedBy = 'Ouvert par'; @@ -35,12 +40,14 @@ $lang->execution->workHourUnit = 'H'; $lang->execution->totalHours = 'Budget (Heure)'; $lang->execution->totalDays = 'Budget (Jour)'; $lang->execution->status = 'Statut'; -$lang->execution->subStatus = 'Sous-statut'; +$lang->execution->execStatus = 'Status'; +$lang->execution->subStatus = 'Sub Status'; $lang->execution->desc = 'Description'; +$lang->execution->execDesc = 'Description'; $lang->execution->owner = 'Propriétaire'; $lang->execution->PO = "Propriétaire {$lang->executionCommon}"; $lang->execution->PM = "Directeur {$lang->executionCommon}"; -$lang->execution->QD = 'Quality Manager'; +$lang->execution->QD = 'Test Manager'; $lang->execution->RD = 'Release Manager'; $lang->execution->release = 'Release'; $lang->execution->acl = "Contrôle d'accès"; @@ -65,9 +72,10 @@ $lang->execution->undone = 'Non Terminé'; $lang->execution->unclosed = 'Non Fermées'; $lang->execution->typeDesc = "Aucune {$lang->SRCommon}, bug, build, test, ou graphe d'atterrissage n'est disponible"; $lang->execution->mine = 'A Moi: '; +$lang->execution->involved = 'Mine: '; $lang->execution->other = 'Autres:'; $lang->execution->deleted = 'Supprimé'; -$lang->execution->delayed = 'Ajourné'; +$lang->execution->delayed = 'Delayed'; $lang->execution->product = $lang->execution->products; $lang->execution->readjustTime = "Ajuster Début et Fin du {$lang->executionCommon}"; $lang->execution->readjustTask = 'Ajuster Début et Fin de la Tâche'; @@ -97,6 +105,10 @@ $lang->execution->endList[93] = '3 Mois'; $lang->execution->endList[186] = '6 Mois'; $lang->execution->endList[365] = '1 Année'; +$lang->execution->lifeTimeList['short'] = "Short-Term"; +$lang->execution->lifeTimeList['long'] = "Long-Term"; +$lang->execution->lifeTimeList['ops'] = "DevOps"; + $lang->team = new stdclass(); $lang->team->account = 'Utilisateur'; $lang->team->role = 'Rôle'; @@ -143,6 +155,7 @@ $lang->execution->groupTask = 'Vision Groupée'; $lang->execution->story = 'Liste Stories'; $lang->execution->qa = 'QA'; $lang->execution->bug = 'Liste Bugs'; +$lang->execution->testcase = 'Testcase List'; $lang->execution->dynamic = 'Historique'; $lang->execution->latestDynamic = 'Historique'; $lang->execution->build = 'Liste Builds'; @@ -175,6 +188,8 @@ $lang->execution->treeAction = "Arborescence {$lang->executionCommon}"; $lang->execution->exportAction = "Exporter {$lang->executionCommon}"; $lang->execution->computeBurnAction = "Calculer Atterrissage"; $lang->execution->create = "Créer {$lang->executionCommon}"; +$lang->execution->createExec = "Create Execution"; +$lang->execution->copyExec = "Copy Execution"; $lang->execution->copy = "Copier {$lang->executionCommon}"; $lang->execution->delete = "Supprimer {$lang->executionCommon}"; $lang->execution->browse = "Liste du {$lang->executionCommon}"; @@ -243,8 +258,6 @@ $lang->execution->linkStoryByPlanTips = "Cette action va lier toutes les stories $lang->execution->selectExecution = "Sélectionner {$lang->executionCommon}"; $lang->execution->selectExecution = "Select Execution"; $lang->execution->beginAndEnd = 'Durée'; -$lang->execution->begin = 'Début'; -$lang->execution->end = 'Fin'; $lang->execution->lblStats = 'Efforts'; $lang->execution->stats = 'Disponible: %s(h). Estimé: %s(h). Coût: %s(h). Reste: %s(h).'; $lang->execution->taskSummary = "Total des tâches de cette page :%s. A Faire: %s. En cours: %s. Estimé: %s(h). Coût: %s(h). Reste: %s(h)."; @@ -303,12 +316,7 @@ $lang->execution->fixFirstWithLeft = 'Mettre à jour les heures égalem $lang->execution->unfinishedExecution = "This {$lang->executionCommon} has "; $lang->execution->unfinishedTask = "[%s] unfinished tasks. "; $lang->execution->unresolvedBug = "[%s] unresolved bugs. "; - -$lang->execution->action = new stdclass(); -$lang->execution->action->opened = '$date, créée par $actor .' . "\n"; -$lang->execution->action->managed = '$date, gérée par $actor .' . "\n"; -$lang->execution->action->edited = '$date, edited by $actor . $extra' . "\n"; -$lang->execution->action->extra = "Les {$lang->productCommon}s associés sont %s."; +$lang->execution->projectNotEmpty = 'Project cannot be empty.'; /* 统计。*/ $lang->execution->charts = new stdclass(); diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php index dcdd0e736e..ffea36f243 100644 --- a/module/execution/lang/vi.php +++ b/module/execution/lang/vi.php @@ -10,12 +10,17 @@ * @link http://www.zentao.net */ /* Fields. */ +$lang->executionCommon = $lang->executionCommon; $lang->execution->common = $lang->executionCommon; $lang->execution->allExecutions = 'Tất cả ' . $lang->executionCommon; $lang->execution->id = 'ID '.$lang->executionCommon; $lang->execution->type = 'Loại'; $lang->execution->name = "Tên {$lang->executionCommon}"; $lang->execution->code = 'Mã'; +$lang->execution->project = 'Project'; +$lang->execution->execName = 'Execution Name'; +$lang->execution->execCode = 'Execution Code'; +$lang->execution->execType = 'Execution Type'; $lang->execution->statge = 'Giai đoạn'; $lang->execution->pri = 'Ưu tiên'; $lang->execution->openedBy = 'Mở bởi'; @@ -35,14 +40,15 @@ $lang->execution->workHourUnit = 'H'; $lang->execution->totalHours = 'Giờ khả dụng'; $lang->execution->totalDays = 'Ngày khả dụng'; $lang->execution->status = 'Tình trạng'; +$lang->execution->execStatus = 'Status'; $lang->execution->subStatus = 'Tình trạng con'; $lang->execution->desc = 'Mô tả'; +$lang->execution->execDesc = 'Description'; $lang->execution->owner = 'Sở hữu'; $lang->execution->PO = "Sở hữu {$lang->executionCommon}"; $lang->execution->PM = "Quản lý {$lang->executionCommon}"; $lang->execution->QD = 'Quản lý QA'; $lang->execution->RD = 'Quản lý phát hành'; -$lang->execution->qa = 'QA'; $lang->execution->release = 'Phát hành'; $lang->execution->acl = 'Quyền truy cập'; $lang->execution->teamname = 'Tên đội nhóm'; @@ -69,6 +75,7 @@ $lang->execution->mine = 'Của bạn: '; $lang->execution->other = 'Khác:'; $lang->execution->deleted = 'Đã xóa'; $lang->execution->delayed = 'Tạm ngưng'; +$lang->execution->delayed = 'Delayed'; $lang->execution->product = $lang->execution->products; $lang->execution->readjustTime = "Điều chỉnh {$lang->executionCommon} Thời gian"; $lang->execution->readjustTask = 'Điều chỉnh nhiệm vụ Thời gian'; @@ -98,6 +105,10 @@ $lang->execution->endList[93] = '3 tháng'; $lang->execution->endList[186] = '6 tháng'; $lang->execution->endList[365] = '1 năm'; +$lang->execution->lifeTimeList['short'] = "Short-Term"; +$lang->execution->lifeTimeList['long'] = "Long-Term"; +$lang->execution->lifeTimeList['ops'] = "DevOps"; + $lang->team = new stdclass(); $lang->team->account = 'Người dùng'; $lang->team->role = 'Vai trò'; @@ -148,6 +159,7 @@ $lang->execution->dynamic = 'Lịch sử'; $lang->execution->latestDynamic = 'Lịch sử'; $lang->execution->build = 'Danh sách bản dựng'; $lang->execution->testtask = 'Kiểm thử'; +$lang->execution->testtask = 'Request'; $lang->execution->burn = 'Burndown'; $lang->execution->computeBurn = 'Cập nhật'; $lang->execution->burnData = 'Dữ liệu Burndown'; @@ -178,6 +190,8 @@ $lang->execution->computeBurnAction = "Tính Burndown"; $lang->execution->create = "Tạo {$lang->executionCommon}"; $lang->execution->copy = "Sao chép {$lang->executionCommon}"; $lang->execution->delete = "Xóa {$lang->executionCommon}"; +$lang->execution->copy = "Copy {$lang->executionCommon}"; +$lang->execution->delete = "Delete {$lang->executionCommon}"; $lang->execution->browse = "{$lang->executionCommon} List"; $lang->execution->list = "{$lang->executionCommon} List"; $lang->execution->edit = "Sửa {$lang->executionCommon}"; @@ -244,8 +258,6 @@ $lang->execution->linkStoryByPlanTips = "Hành động này sẽ liên kết t $lang->execution->selectExecution = "Chọn {$lang->executionCommon}"; $lang->execution->selectExecution = "Select Execution"; $lang->execution->beginAndEnd = 'Thời gian'; -$lang->execution->begin = 'Bắt đầu'; -$lang->execution->end = 'Kết thúc'; $lang->execution->lblStats = 'Chấm công'; $lang->execution->stats = 'Khả dụng: %s(giờ). Dự tính: %s(giờ). Đã làm: %s(giờ). Còn: %s(giờ).'; $lang->execution->taskSummary = "Tổng nhiệm vụ:%s. Đang đợi: %s. Đang làm: %s. Dự tính: %s(giờ). Đã làm: %s(giờ). Còn: %s(giờ)."; @@ -304,12 +316,7 @@ $lang->execution->fixFirstWithLeft = 'Cập nhật cả giờ còn lạ $lang->execution->unfinishedExecution = "This {$lang->executionCommon} has "; $lang->execution->unfinishedTask = "[%s] unfinished tasks. "; $lang->execution->unresolvedBug = "[%s] unresolved bugs. "; - -$lang->execution->action = new stdclass(); -$lang->execution->action->opened = '$date, được tạo bởi $actor $extra.' . "\n"; -$lang->execution->action->managed = '$date, quản lý bởi $actor . $extra' . "\n"; -$lang->execution->action->edited = '$date, edited by $actor . $extra' . "\n"; -$lang->execution->action->extra = "{$lang->productCommon} liên kết này là %s."; +$lang->execution->projectNotEmpty = 'Project cannot be empty.'; /* Statistics. */ $lang->execution->charts = new stdclass(); diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 0cd07090ca..9b4ceb0996 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -20,6 +20,7 @@ $lang->execution->code = $lang->executionCommon . '代号'; $lang->execution->project = '所属项目'; $lang->execution->execName = '执行名称'; $lang->execution->execCode = '执行代号'; +$lang->execution->execType = '执行类型'; $lang->execution->statge = '阶段'; $lang->execution->pri = '优先级'; $lang->execution->openedBy = '由谁创建'; @@ -42,6 +43,7 @@ $lang->execution->status = $lang->executionCommon . '状态'; $lang->execution->execStatus = '执行状态'; $lang->execution->subStatus = '子状态'; $lang->execution->desc = $lang->executionCommon . '描述'; +$lang->execution->execDesc = '执行描述'; $lang->execution->owner = '负责人'; $lang->execution->PO = $lang->productCommon . '负责人'; $lang->execution->PM = $lang->executionCommon . '负责人'; @@ -187,6 +189,7 @@ $lang->execution->exportAction = "导出{$lang->executionCommon}"; $lang->execution->computeBurnAction = "计算燃尽图"; $lang->execution->create = "添加{$lang->executionCommon}"; $lang->execution->createExec = "添加执行"; +$lang->execution->copyExec = "复制执行"; $lang->execution->copy = "复制{$lang->executionCommon}"; $lang->execution->delete = "删除{$lang->executionCommon}"; $lang->execution->browse = "浏览{$lang->executionCommon}"; diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php index bab883d43a..6b385ba32b 100644 --- a/module/execution/view/create.html.php +++ b/module/execution/view/create.html.php @@ -38,9 +38,9 @@