From 95bfccb4ded95dd221e3a7dd703c021947596b3e Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 19 Apr 2021 16:39:43 +0800 Subject: [PATCH 1/5] * Fix bug #12238. --- module/story/view/change.html.php | 2 +- module/story/view/close.html.php | 2 +- module/story/view/edit.html.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php index 3577d224e6..98fc99a007 100644 --- a/module/story/view/change.html.php +++ b/module/story/view/change.html.php @@ -71,7 +71,7 @@ lastEditedDate); echo html::submitButton(); - echo html::a($app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), $lang->goback, '', 'class="btn btn-wide"'); + if($app->openApp != 'my') echo html::a($app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), $lang->goback, '', 'class="btn btn-wide"'); ?> diff --git a/module/story/view/close.html.php b/module/story/view/close.html.php index b9d7158cdf..6fcac6652b 100644 --- a/module/story/view/close.html.php +++ b/module/story/view/close.html.php @@ -48,7 +48,7 @@ - session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), $lang->goback, '', 'class="btn btn-wide"');?> + openApp != 'my') echo html::a($app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), $lang->goback, '', 'class="btn btn-wide"');?> diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index 6facb9d44c..5087d38d40 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -58,7 +58,7 @@ lastEditedDate); echo html::submitButton($lang->save); - echo html::a($app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), $lang->goback, '', 'class="btn btn-wide"'); + if($app->openApp != 'my') echo html::a($app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), $lang->goback, '', 'class="btn btn-wide"'); ?>
From 9d1873ca7184e2284447750bf51b2875ce5d0914 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 19 Apr 2021 16:52:01 +0800 Subject: [PATCH 2/5] * Fix bug #12244. --- module/my/view/execution.html.php | 9 ++++++++- module/my/view/project.html.php | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php index a2fbe40dc8..de99c17db4 100644 --- a/module/my/view/execution.html.php +++ b/module/my/view/execution.html.php @@ -53,7 +53,14 @@ id));?> - name, '', "title='$execution->name'");?> + config->maxVersion)) + { + if($execution->type === 'stage') echo "{$lang->project->stage} "; + if($execution->type === 'sprint') echo "{$lang->executionCommon} "; + } + echo html::a($link, $execution->name, '', "title='$execution->name'"); + ?> systemMode == 'new'):?> createLink('project', 'view', "id=$execution->project", '', '', $execution->project), $execution->projectName, '', "title='$execution->projectName'");?> diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php index 3d42736020..8d0131955e 100644 --- a/module/my/view/project.html.php +++ b/module/my/view/project.html.php @@ -57,7 +57,14 @@ id);?> - createLink('project', 'index', "projectID=$project->id", '', '', $project->id), $project->name, '', "data-group='project'");?> + config->maxVersion)) + { + if($project->model === 'waterfall') echo "{$lang->project->waterfall} "; + if($project->model === 'scrum') echo "{$lang->project->scrum} "; + } + echo html::a($this->createLink('project', 'index', "projectID=$project->id", '', '', $project->id), $project->name, '', "data-group='project'"); + ?> project->statusList, $project->status, '');?> From ae090c630dc9311be5b79d98e59e51a73d76b41f Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 19 Apr 2021 17:11:12 +0800 Subject: [PATCH 3/5] * Fix bug #12247. --- module/execution/lang/de.php | 157 +++++++++++++------------- module/execution/lang/en.php | 157 +++++++++++++------------- module/execution/lang/fr.php | 157 +++++++++++++------------- module/execution/lang/vi.php | 157 +++++++++++++------------- module/execution/lang/zh-cn.php | 157 +++++++++++++------------- module/execution/view/create.html.php | 2 +- 6 files changed, 396 insertions(+), 391 deletions(-) diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 6ecb67a29f..86162d4178 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -10,85 +10,86 @@ * @link http://www.zentao.net */ /* Fields. */ -$lang->execution->allExecutions = 'Alle'; -$lang->execution->allExecutionAB = 'All Executions'; -$lang->execution->id = $lang->executionCommon . ' ID'; -$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->stage = 'Stage'; -$lang->execution->pri = 'Priorität'; -$lang->execution->openedBy = 'OpenedBy'; -$lang->execution->openedDate = 'OpenedDate'; -$lang->execution->closedBy = 'ClosedBy'; -$lang->execution->closedDate = 'ClosedDate'; -$lang->execution->canceledBy = 'CanceledBy'; -$lang->execution->canceledDate = 'CanceledDate'; -$lang->execution->begin = 'Start'; -$lang->execution->end = 'Ende'; -$lang->execution->dateRange = 'Dauer'; -$lang->execution->to = 'An'; -$lang->execution->days = 'Manntage'; -$lang->execution->day = 'Tag'; -$lang->execution->workHour = 'Stunden'; -$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 = "{$lang->executionCommon} Owner"; -$lang->execution->PM = "{$lang->executionCommon} Manager"; -$lang->execution->execPM = "Execution Manager"; -$lang->execution->QD = 'Test Manager'; -$lang->execution->RD = 'Release Manager'; -$lang->execution->release = 'Release'; -$lang->execution->acl = 'Zugriffskontrolle'; -$lang->execution->teamname = 'Team Name'; -$lang->execution->order = "Sortierung {$lang->executionCommon}"; -$lang->execution->orderAB = "Rank"; -$lang->execution->products = "Verknüpfung {$lang->productCommon}"; -$lang->execution->whitelist = 'Whitelist'; -$lang->execution->addWhitelist = 'Add Whitelist'; +$lang->execution->allExecutions = 'Alle'; +$lang->execution->allExecutionAB = 'All Executions'; +$lang->execution->id = $lang->executionCommon . ' ID'; +$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->stage = 'Stage'; +$lang->execution->pri = 'Priorität'; +$lang->execution->openedBy = 'OpenedBy'; +$lang->execution->openedDate = 'OpenedDate'; +$lang->execution->closedBy = 'ClosedBy'; +$lang->execution->closedDate = 'ClosedDate'; +$lang->execution->canceledBy = 'CanceledBy'; +$lang->execution->canceledDate = 'CanceledDate'; +$lang->execution->begin = 'Start'; +$lang->execution->end = 'Ende'; +$lang->execution->dateRange = 'Dauer'; +$lang->execution->to = 'An'; +$lang->execution->days = 'Manntage'; +$lang->execution->day = 'Tag'; +$lang->execution->workHour = 'Stunden'; +$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 = "{$lang->executionCommon} Owner"; +$lang->execution->PM = "{$lang->executionCommon} Manager"; +$lang->execution->execPM = "Execution Manager"; +$lang->execution->QD = 'Test Manager'; +$lang->execution->RD = 'Release Manager'; +$lang->execution->release = 'Release'; +$lang->execution->acl = 'Zugriffskontrolle'; +$lang->execution->teamname = 'Team Name'; +$lang->execution->order = "Sortierung {$lang->executionCommon}"; +$lang->execution->orderAB = "Rank"; +$lang->execution->products = "Verknüpfung {$lang->productCommon}"; +$lang->execution->whitelist = 'Whitelist'; +$lang->execution->addWhitelist = 'Add Whitelist'; $lang->execution->unbindWhitelist = 'Remove Whitelist'; -$lang->execution->totalEstimate = 'Geplant'; -$lang->execution->totalConsumed = 'Genutzt'; -$lang->execution->totalLeft = 'Rest'; -$lang->execution->progress = 'Fortschritt'; -$lang->execution->hours = '%s geplant, %s verbraucht, %s Rest.'; -$lang->execution->viewBug = 'Bugs'; -$lang->execution->noProduct = "Kein {$lang->productCommon}"; -$lang->execution->createStory = "Story erstellen"; -$lang->execution->storyTitle = "Story Name"; -$lang->execution->all = 'Alle'; -$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'; -$lang->execution->product = $lang->execution->products; -$lang->execution->readjustTime = 'Start und Ende anpassen'; -$lang->execution->readjustTask = 'Fälligkeit der Aufgabe anpassen'; -$lang->execution->effort = 'Aufwand'; -$lang->execution->relatedMember = 'Teammitglieder'; -$lang->execution->watermark = 'Exported by ZenTao'; -$lang->execution->burnXUnit = '(Date)'; -$lang->execution->burnYUnit = '(Hours)'; -$lang->execution->waitTasks = 'Waiting Tasks'; -$lang->execution->viewByUser = 'By User'; -$lang->execution->oneProduct = "Only one stage can be linked {$lang->productCommon}"; -$lang->execution->noLinkProduct = "Stage not linked {$lang->productCommon}"; -$lang->execution->recent = 'Recent visits: '; +$lang->execution->totalEstimate = 'Geplant'; +$lang->execution->totalConsumed = 'Genutzt'; +$lang->execution->totalLeft = 'Rest'; +$lang->execution->progress = 'Fortschritt'; +$lang->execution->hours = '%s geplant, %s verbraucht, %s Rest.'; +$lang->execution->viewBug = 'Bugs'; +$lang->execution->noProduct = "Kein {$lang->productCommon}"; +$lang->execution->createStory = "Story erstellen"; +$lang->execution->storyTitle = "Story Name"; +$lang->execution->all = 'Alle'; +$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'; +$lang->execution->product = $lang->execution->products; +$lang->execution->readjustTime = 'Start und Ende anpassen'; +$lang->execution->readjustTask = 'Fälligkeit der Aufgabe anpassen'; +$lang->execution->effort = 'Aufwand'; +$lang->execution->relatedMember = 'Teammitglieder'; +$lang->execution->watermark = 'Exported by ZenTao'; +$lang->execution->burnXUnit = '(Date)'; +$lang->execution->burnYUnit = '(Hours)'; +$lang->execution->waitTasks = 'Waiting Tasks'; +$lang->execution->viewByUser = 'By User'; +$lang->execution->oneProduct = "Only one stage can be linked {$lang->productCommon}"; +$lang->execution->noLinkProduct = "Stage not linked {$lang->productCommon}"; +$lang->execution->recent = 'Recent visits: '; +$lang->execution->copyNoExecution = 'There are no ' . $lang->executionCommon . 'available to copy.'; $lang->execution->start = 'Start'; $lang->execution->activate = 'Aktivieren'; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index d916e1db2c..21dc5aed81 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -10,85 +10,86 @@ * @link http://www.zentao.net */ /* Fields. */ -$lang->execution->allExecutions = 'All ' . $lang->executionCommon . 's'; -$lang->execution->allExecutionAB = 'All Executions'; -$lang->execution->id = $lang->executionCommon . ' ID'; -$lang->execution->type = $lang->executionCommon . 'Type'; -$lang->execution->name = $lang->executionCommon . 'Name'; -$lang->execution->code = $lang->executionCommon . 'Code'; -$lang->execution->project = 'Project'; -$lang->execution->execName = 'Execution Name'; -$lang->execution->execCode = 'Execution Code'; -$lang->execution->execType = 'Execution Type'; -$lang->execution->stage = 'Stage'; -$lang->execution->pri = 'Priority'; -$lang->execution->openedBy = 'OpenedBy'; -$lang->execution->openedDate = 'OpenedDate'; -$lang->execution->closedBy = 'ClosedBy'; -$lang->execution->closedDate = 'ClosedDate'; -$lang->execution->canceledBy = 'CanceledBy'; -$lang->execution->canceledDate = 'CanceledDate'; -$lang->execution->begin = 'Begin'; -$lang->execution->end = 'End'; -$lang->execution->dateRange = 'Duration'; -$lang->execution->to = 'To'; -$lang->execution->days = 'Available Days'; -$lang->execution->day = ' Days'; -$lang->execution->workHour = ' Hours'; -$lang->execution->workHourUnit = 'H'; -$lang->execution->totalHours = 'Available Hours'; -$lang->execution->totalDays = 'Available Days'; -$lang->execution->status = $lang->executionCommon . 'Status'; -$lang->execution->execStatus = 'Status'; -$lang->execution->subStatus = 'Sub Status'; -$lang->execution->desc = $lang->executionCommon . 'Description'; -$lang->execution->execDesc = 'Description'; -$lang->execution->owner = 'Owner'; -$lang->execution->PO = "{$lang->executionCommon} Owner"; -$lang->execution->PM = "{$lang->executionCommon} Manager"; -$lang->execution->execPM = "Execution Manager"; -$lang->execution->QD = 'Test Manager'; -$lang->execution->RD = 'Release Manager'; -$lang->execution->release = 'Release'; -$lang->execution->acl = 'Access Control'; -$lang->execution->teamname = 'Team Name'; -$lang->execution->order = "Rank {$lang->executionCommon}"; -$lang->execution->orderAB = "Rank"; -$lang->execution->products = "Link {$lang->productCommon}"; -$lang->execution->whitelist = 'Whitelist'; -$lang->execution->addWhitelist = 'Add Whitelist'; +$lang->execution->allExecutions = 'All ' . $lang->executionCommon . 's'; +$lang->execution->allExecutionAB = 'All Executions'; +$lang->execution->id = $lang->executionCommon . ' ID'; +$lang->execution->type = $lang->executionCommon . 'Type'; +$lang->execution->name = $lang->executionCommon . 'Name'; +$lang->execution->code = $lang->executionCommon . 'Code'; +$lang->execution->project = 'Project'; +$lang->execution->execName = 'Execution Name'; +$lang->execution->execCode = 'Execution Code'; +$lang->execution->execType = 'Execution Type'; +$lang->execution->stage = 'Stage'; +$lang->execution->pri = 'Priority'; +$lang->execution->openedBy = 'OpenedBy'; +$lang->execution->openedDate = 'OpenedDate'; +$lang->execution->closedBy = 'ClosedBy'; +$lang->execution->closedDate = 'ClosedDate'; +$lang->execution->canceledBy = 'CanceledBy'; +$lang->execution->canceledDate = 'CanceledDate'; +$lang->execution->begin = 'Begin'; +$lang->execution->end = 'End'; +$lang->execution->dateRange = 'Duration'; +$lang->execution->to = 'To'; +$lang->execution->days = 'Available Days'; +$lang->execution->day = ' Days'; +$lang->execution->workHour = ' Hours'; +$lang->execution->workHourUnit = 'H'; +$lang->execution->totalHours = 'Available Hours'; +$lang->execution->totalDays = 'Available Days'; +$lang->execution->status = $lang->executionCommon . 'Status'; +$lang->execution->execStatus = 'Status'; +$lang->execution->subStatus = 'Sub Status'; +$lang->execution->desc = $lang->executionCommon . 'Description'; +$lang->execution->execDesc = 'Description'; +$lang->execution->owner = 'Owner'; +$lang->execution->PO = "{$lang->executionCommon} Owner"; +$lang->execution->PM = "{$lang->executionCommon} Manager"; +$lang->execution->execPM = "Execution Manager"; +$lang->execution->QD = 'Test Manager'; +$lang->execution->RD = 'Release Manager'; +$lang->execution->release = 'Release'; +$lang->execution->acl = 'Access Control'; +$lang->execution->teamname = 'Team Name'; +$lang->execution->order = "Rank {$lang->executionCommon}"; +$lang->execution->orderAB = "Rank"; +$lang->execution->products = "Link {$lang->productCommon}"; +$lang->execution->whitelist = 'Whitelist'; +$lang->execution->addWhitelist = 'Add Whitelist'; $lang->execution->unbindWhitelist = 'Remove Whitelist'; -$lang->execution->totalEstimate = 'Estimates'; -$lang->execution->totalConsumed = 'Cost'; -$lang->execution->totalLeft = 'Left'; -$lang->execution->progress = ' Progress'; -$lang->execution->hours = 'Estimates: %s, Cost: %s, Left: %s.'; -$lang->execution->viewBug = 'Bugs'; -$lang->execution->noProduct = "No {$lang->productCommon} yet."; -$lang->execution->createStory = "Create Story"; -$lang->execution->storyTitle = "Story Name"; -$lang->execution->all = "All {$lang->executionCommon}s"; -$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'; -$lang->execution->product = $lang->execution->products; -$lang->execution->readjustTime = "Adjust {$lang->executionCommon} Begin and End"; -$lang->execution->readjustTask = 'Adjust Task Begin and End'; -$lang->execution->effort = 'Effort'; -$lang->execution->relatedMember = 'Team'; -$lang->execution->watermark = 'Exported by ZenTao'; -$lang->execution->burnXUnit = '(Date)'; -$lang->execution->burnYUnit = '(Hours)'; -$lang->execution->waitTasks = 'Waiting Tasks'; -$lang->execution->viewByUser = 'By User'; -$lang->execution->oneProduct = "Only one stage can be linked {$lang->productCommon}"; -$lang->execution->noLinkProduct = "Stage not linked {$lang->productCommon}"; -$lang->execution->recent = 'Recent visits: '; +$lang->execution->totalEstimate = 'Estimates'; +$lang->execution->totalConsumed = 'Cost'; +$lang->execution->totalLeft = 'Left'; +$lang->execution->progress = ' Progress'; +$lang->execution->hours = 'Estimates: %s, Cost: %s, Left: %s.'; +$lang->execution->viewBug = 'Bugs'; +$lang->execution->noProduct = "No {$lang->productCommon} yet."; +$lang->execution->createStory = "Create Story"; +$lang->execution->storyTitle = "Story Name"; +$lang->execution->all = "All {$lang->executionCommon}s"; +$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'; +$lang->execution->product = $lang->execution->products; +$lang->execution->readjustTime = "Adjust {$lang->executionCommon} Begin and End"; +$lang->execution->readjustTask = 'Adjust Task Begin and End'; +$lang->execution->effort = 'Effort'; +$lang->execution->relatedMember = 'Team'; +$lang->execution->watermark = 'Exported by ZenTao'; +$lang->execution->burnXUnit = '(Date)'; +$lang->execution->burnYUnit = '(Hours)'; +$lang->execution->waitTasks = 'Waiting Tasks'; +$lang->execution->viewByUser = 'By User'; +$lang->execution->oneProduct = "Only one stage can be linked {$lang->productCommon}"; +$lang->execution->noLinkProduct = "Stage not linked {$lang->productCommon}"; +$lang->execution->recent = 'Recent visits: '; +$lang->execution->copyNoExecution = 'There are no ' . $lang->executionCommon . 'available to copy.'; $lang->execution->start = 'Start'; $lang->execution->activate = 'Activate'; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index ab7290e61e..5e9a4a1e0b 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -10,85 +10,86 @@ * @link https://www.zentao.pm */ /* Fields. */ -$lang->execution->allExecutions = 'Tous les ' . $lang->executionCommon . 's'; -$lang->execution->allExecutionAB = 'All Executions'; -$lang->execution->id = $lang->executionCommon . ' ID'; -$lang->execution->type = $lang->executionCommon . 'Type'; -$lang->execution->name = $lang->executionCommon . 'Name'; -$lang->execution->code = $lang->executionCommon . 'Code'; -$lang->execution->project = 'Project'; -$lang->execution->execName = 'Execution Name'; -$lang->execution->execCode = 'Execution Code'; -$lang->execution->execType = 'Execution Type'; -$lang->execution->stage = 'Etape'; -$lang->execution->pri = 'Priorité'; -$lang->execution->openedBy = 'Ouvert par'; -$lang->execution->openedDate = "Date d'ouverture"; -$lang->execution->closedBy = 'Fermé par'; -$lang->execution->closedDate = 'Date de fermeture'; -$lang->execution->canceledBy = 'Annulé par'; -$lang->execution->canceledDate = "Date d'annulation"; -$lang->execution->begin = 'Début'; -$lang->execution->end = 'Fin'; -$lang->execution->dateRange = 'Durée'; -$lang->execution->to = 'à'; -$lang->execution->days = 'Budget Jours'; -$lang->execution->day = ' Jours'; -$lang->execution->workHour = ' Heures'; -$lang->execution->workHourUnit = 'H'; -$lang->execution->totalHours = 'Budget (Heure)'; -$lang->execution->totalDays = 'Budget (Jour)'; -$lang->execution->status = $lang->executionCommon . 'Status'; -$lang->execution->execStatus = 'Status'; -$lang->execution->subStatus = 'Sub Status'; -$lang->execution->desc = $lang->executionCommon . '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->execPM = "Directeur Execution"; -$lang->execution->QD = 'Test Manager'; -$lang->execution->RD = 'Release Manager'; -$lang->execution->release = 'Release'; -$lang->execution->acl = "Contrôle d'accès"; -$lang->execution->teamname = "Nom de l'équipe"; -$lang->execution->order = "Rang du {$lang->executionCommon}"; -$lang->execution->orderAB = "Rang"; -$lang->execution->products = "{$lang->productCommon} liés"; -$lang->execution->whitelist = 'Liste Blanche'; -$lang->execution->addWhitelist = 'Add Whitelist'; +$lang->execution->allExecutions = 'Tous les ' . $lang->executionCommon . 's'; +$lang->execution->allExecutionAB = 'All Executions'; +$lang->execution->id = $lang->executionCommon . ' ID'; +$lang->execution->type = $lang->executionCommon . 'Type'; +$lang->execution->name = $lang->executionCommon . 'Name'; +$lang->execution->code = $lang->executionCommon . 'Code'; +$lang->execution->project = 'Project'; +$lang->execution->execName = 'Execution Name'; +$lang->execution->execCode = 'Execution Code'; +$lang->execution->execType = 'Execution Type'; +$lang->execution->stage = 'Etape'; +$lang->execution->pri = 'Priorité'; +$lang->execution->openedBy = 'Ouvert par'; +$lang->execution->openedDate = "Date d'ouverture"; +$lang->execution->closedBy = 'Fermé par'; +$lang->execution->closedDate = 'Date de fermeture'; +$lang->execution->canceledBy = 'Annulé par'; +$lang->execution->canceledDate = "Date d'annulation"; +$lang->execution->begin = 'Début'; +$lang->execution->end = 'Fin'; +$lang->execution->dateRange = 'Durée'; +$lang->execution->to = 'à'; +$lang->execution->days = 'Budget Jours'; +$lang->execution->day = ' Jours'; +$lang->execution->workHour = ' Heures'; +$lang->execution->workHourUnit = 'H'; +$lang->execution->totalHours = 'Budget (Heure)'; +$lang->execution->totalDays = 'Budget (Jour)'; +$lang->execution->status = $lang->executionCommon . 'Status'; +$lang->execution->execStatus = 'Status'; +$lang->execution->subStatus = 'Sub Status'; +$lang->execution->desc = $lang->executionCommon . '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->execPM = "Directeur Execution"; +$lang->execution->QD = 'Test Manager'; +$lang->execution->RD = 'Release Manager'; +$lang->execution->release = 'Release'; +$lang->execution->acl = "Contrôle d'accès"; +$lang->execution->teamname = "Nom de l'équipe"; +$lang->execution->order = "Rang du {$lang->executionCommon}"; +$lang->execution->orderAB = "Rang"; +$lang->execution->products = "{$lang->productCommon} liés"; +$lang->execution->whitelist = 'Liste Blanche'; +$lang->execution->addWhitelist = 'Add Whitelist'; $lang->execution->unbindWhitelist = 'Remove Whitelist'; -$lang->execution->totalEstimate = 'Estimé'; -$lang->execution->totalConsumed = 'Coût'; -$lang->execution->totalLeft = 'Reste'; -$lang->execution->progress = ' Progrès'; -$lang->execution->hours = 'Estimé: %s, Coût: %s, Reste: %s.'; -$lang->execution->viewBug = 'Bugs'; -$lang->execution->noProduct = "Aucun {$lang->productCommon} pour l'instant."; -$lang->execution->createStory = "Créer une Story"; -$lang->execution->storyTitle = "Story Name"; -$lang->execution->all = "Tous les {$lang->executionCommon}s"; -$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 = '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'; -$lang->execution->effort = 'Effort'; -$lang->execution->relatedMember = 'Equipe'; -$lang->execution->watermark = 'Exporté par ZenTao'; -$lang->execution->burnXUnit = '(Date)'; -$lang->execution->burnYUnit = '(Hours)'; -$lang->execution->waitTasks = 'Waiting Tasks'; -$lang->execution->viewByUser = 'Par Utilisateur'; -$lang->execution->oneProduct = "Only one stage can be linked {$lang->productCommon}"; -$lang->execution->noLinkProduct = "Stage not linked {$lang->productCommon}"; -$lang->execution->recent = 'Recent visits: '; +$lang->execution->totalEstimate = 'Estimé'; +$lang->execution->totalConsumed = 'Coût'; +$lang->execution->totalLeft = 'Reste'; +$lang->execution->progress = ' Progrès'; +$lang->execution->hours = 'Estimé: %s, Coût: %s, Reste: %s.'; +$lang->execution->viewBug = 'Bugs'; +$lang->execution->noProduct = "Aucun {$lang->productCommon} pour l'instant."; +$lang->execution->createStory = "Créer une Story"; +$lang->execution->storyTitle = "Story Name"; +$lang->execution->all = "Tous les {$lang->executionCommon}s"; +$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 = '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'; +$lang->execution->effort = 'Effort'; +$lang->execution->relatedMember = 'Equipe'; +$lang->execution->watermark = 'Exporté par ZenTao'; +$lang->execution->burnXUnit = '(Date)'; +$lang->execution->burnYUnit = '(Hours)'; +$lang->execution->waitTasks = 'Waiting Tasks'; +$lang->execution->viewByUser = 'Par Utilisateur'; +$lang->execution->oneProduct = "Only one stage can be linked {$lang->productCommon}"; +$lang->execution->noLinkProduct = "Stage not linked {$lang->productCommon}"; +$lang->execution->recent = 'Recent visits: '; +$lang->execution->copyNoExecution = 'There are no ' . $lang->executionCommon . 'available to copy.'; $lang->execution->start = 'Démarrer'; $lang->execution->activate = 'Activer'; diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php index ce60cbfa02..da7273e33c 100644 --- a/module/execution/lang/vi.php +++ b/module/execution/lang/vi.php @@ -10,85 +10,86 @@ * @link http://www.zentao.net */ /* Fields. */ -$lang->execution->allExecutions = 'Tất cả ' . $lang->executionCommon; -$lang->execution->allExecutionAB = 'All Executions'; -$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->stage = 'Giai đoạn'; -$lang->execution->pri = 'Ưu tiên'; -$lang->execution->openedBy = 'Mở bởi'; -$lang->execution->openedDate = 'Ngày mở'; -$lang->execution->closedBy = 'Người đóng'; -$lang->execution->closedDate = 'Ngày đóng'; -$lang->execution->canceledBy = 'Hủy bởi'; -$lang->execution->canceledDate = 'Ngày hủy'; -$lang->execution->begin = 'Bắt đầu'; -$lang->execution->end = 'Kết thúc'; -$lang->execution->dateRange = 'Thời gian'; -$lang->execution->to = 'Tới'; -$lang->execution->days = 'Ngày khả dụng'; -$lang->execution->day = ' ngày'; -$lang->execution->workHour = 'giờ'; -$lang->execution->workHourUnit = 'H'; -$lang->execution->totalHours = 'Giờ khả dụng'; -$lang->execution->totalDays = 'Ngày khả dụng'; -$lang->execution->status = $lang->executionCommon . 'Status'; -$lang->execution->execStatus = 'Status'; -$lang->execution->subStatus = 'Tình trạng con'; -$lang->execution->desc = $lang->executionCommon . 'Description'; -$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->execPM = "Quản lý Execution"; -$lang->execution->QD = 'Quản lý QA'; -$lang->execution->RD = 'Quản lý phát hành'; -$lang->execution->release = 'Phát hành'; -$lang->execution->acl = 'Quyền truy cập'; -$lang->execution->teamname = 'Tên đội nhóm'; -$lang->execution->order = "Đánh giá {$lang->executionCommon}"; -$lang->execution->orderAB = "Đánh giá"; -$lang->execution->products = "Liên kết {$lang->productCommon}"; -$lang->execution->whitelist = 'Danh sách trắng'; -$lang->execution->addWhitelist = 'Add Whitelist'; +$lang->execution->allExecutions = 'Tất cả ' . $lang->executionCommon; +$lang->execution->allExecutionAB = 'All Executions'; +$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->stage = 'Giai đoạn'; +$lang->execution->pri = 'Ưu tiên'; +$lang->execution->openedBy = 'Mở bởi'; +$lang->execution->openedDate = 'Ngày mở'; +$lang->execution->closedBy = 'Người đóng'; +$lang->execution->closedDate = 'Ngày đóng'; +$lang->execution->canceledBy = 'Hủy bởi'; +$lang->execution->canceledDate = 'Ngày hủy'; +$lang->execution->begin = 'Bắt đầu'; +$lang->execution->end = 'Kết thúc'; +$lang->execution->dateRange = 'Thời gian'; +$lang->execution->to = 'Tới'; +$lang->execution->days = 'Ngày khả dụng'; +$lang->execution->day = ' ngày'; +$lang->execution->workHour = 'giờ'; +$lang->execution->workHourUnit = 'H'; +$lang->execution->totalHours = 'Giờ khả dụng'; +$lang->execution->totalDays = 'Ngày khả dụng'; +$lang->execution->status = $lang->executionCommon . 'Status'; +$lang->execution->execStatus = 'Status'; +$lang->execution->subStatus = 'Tình trạng con'; +$lang->execution->desc = $lang->executionCommon . 'Description'; +$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->execPM = "Quản lý Execution"; +$lang->execution->QD = 'Quản lý QA'; +$lang->execution->RD = 'Quản lý phát hành'; +$lang->execution->release = 'Phát hành'; +$lang->execution->acl = 'Quyền truy cập'; +$lang->execution->teamname = 'Tên đội nhóm'; +$lang->execution->order = "Đánh giá {$lang->executionCommon}"; +$lang->execution->orderAB = "Đánh giá"; +$lang->execution->products = "Liên kết {$lang->productCommon}"; +$lang->execution->whitelist = 'Danh sách trắng'; +$lang->execution->addWhitelist = 'Add Whitelist'; $lang->execution->unbindWhitelist = 'Remove Whitelist'; -$lang->execution->totalEstimate = 'Dự tính'; -$lang->execution->totalConsumed = 'Đã làm'; -$lang->execution->totalLeft = 'Còn'; -$lang->execution->progress = ' Tiến độ'; -$lang->execution->hours = 'Dự tính: %s, Đã làm: %s, Còn: %s.'; -$lang->execution->viewBug = 'Bugs'; -$lang->execution->noProduct = "Không có {$lang->productCommon} nào."; -$lang->execution->createStory = "Tạo câu chuyện"; -$lang->execution->storyTitle = "Story Name"; -$lang->execution->all = "Tất cả {$lang->executionCommon}"; -$lang->execution->undone = 'Chưa kết thúc '; -$lang->execution->unclosed = 'Chưa đóng'; -$lang->execution->typeDesc = 'Không có câu chuyện, bug, bản dựng, test, hoặc biểu đồ burndown được phép trong OPS'; -$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'; -$lang->execution->effort = 'Chấm công'; -$lang->execution->relatedMember = 'Đội nhóm'; -$lang->execution->watermark = 'Đã xuất bởi ZenTao'; -$lang->execution->burnXUnit = '(Date)'; -$lang->execution->burnYUnit = '(Hours)'; -$lang->execution->waitTasks = 'Waiting Tasks'; -$lang->execution->viewByUser = 'Theo người dùng'; -$lang->execution->oneProduct = "Only one stage can be linked {$lang->productCommon}"; -$lang->execution->noLinkProduct = "Stage not linked {$lang->productCommon}"; -$lang->execution->recent = 'Recent visits: '; +$lang->execution->totalEstimate = 'Dự tính'; +$lang->execution->totalConsumed = 'Đã làm'; +$lang->execution->totalLeft = 'Còn'; +$lang->execution->progress = ' Tiến độ'; +$lang->execution->hours = 'Dự tính: %s, Đã làm: %s, Còn: %s.'; +$lang->execution->viewBug = 'Bugs'; +$lang->execution->noProduct = "Không có {$lang->productCommon} nào."; +$lang->execution->createStory = "Tạo câu chuyện"; +$lang->execution->storyTitle = "Story Name"; +$lang->execution->all = "Tất cả {$lang->executionCommon}"; +$lang->execution->undone = 'Chưa kết thúc '; +$lang->execution->unclosed = 'Chưa đóng'; +$lang->execution->typeDesc = 'Không có câu chuyện, bug, bản dựng, test, hoặc biểu đồ burndown được phép trong OPS'; +$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'; +$lang->execution->effort = 'Chấm công'; +$lang->execution->relatedMember = 'Đội nhóm'; +$lang->execution->watermark = 'Đã xuất bởi ZenTao'; +$lang->execution->burnXUnit = '(Date)'; +$lang->execution->burnYUnit = '(Hours)'; +$lang->execution->waitTasks = 'Waiting Tasks'; +$lang->execution->viewByUser = 'Theo người dùng'; +$lang->execution->oneProduct = "Only one stage can be linked {$lang->productCommon}"; +$lang->execution->noLinkProduct = "Stage not linked {$lang->productCommon}"; +$lang->execution->recent = 'Recent visits: '; +$lang->execution->copyNoExecution = 'There are no ' . $lang->executionCommon . 'available to copy.'; $lang->execution->start = 'Bắt đầu'; $lang->execution->activate = 'Kích hoạt'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index c8f672cb9c..b35489f57c 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -10,85 +10,86 @@ * @link http://www.zentao.net */ /* 字段列表。*/ -$lang->execution->allExecutions = '所有' . $lang->executionCommon; -$lang->execution->allExecutionAB = "所有{$lang->execution->common}"; -$lang->execution->id = $lang->executionCommon . '编号'; -$lang->execution->type = $lang->executionCommon . '类型'; -$lang->execution->name = $lang->executionCommon . '名称'; -$lang->execution->code = $lang->executionCommon . '代号'; -$lang->execution->project = '所属项目'; -$lang->execution->execName = "{$lang->execution->common}名称"; -$lang->execution->execCode = "{$lang->execution->common}代号"; -$lang->execution->execType = "{$lang->execution->common}类型"; -$lang->execution->stage = '阶段'; -$lang->execution->pri = '优先级'; -$lang->execution->openedBy = '由谁创建'; -$lang->execution->openedDate = '创建日期'; -$lang->execution->closedBy = '由谁关闭'; -$lang->execution->closedDate = '关闭日期'; -$lang->execution->canceledBy = '由谁取消'; -$lang->execution->canceledDate = '取消日期'; -$lang->execution->begin = '开始日期'; -$lang->execution->end = '结束日期'; -$lang->execution->dateRange = '起始日期'; -$lang->execution->to = '至'; -$lang->execution->days = '可用工作日'; -$lang->execution->day = '天'; -$lang->execution->workHour = '工时'; -$lang->execution->workHourUnit = 'h'; -$lang->execution->totalHours = '可用工时'; -$lang->execution->totalDays = '可用工日'; -$lang->execution->status = $lang->executionCommon . '状态'; -$lang->execution->execStatus = "{$lang->execution->common}状态"; -$lang->execution->subStatus = '子状态'; -$lang->execution->desc = $lang->executionCommon . '描述'; -$lang->execution->execDesc = "{$lang->execution->common}描述"; -$lang->execution->owner = '负责人'; -$lang->execution->PO = $lang->productCommon . '负责人'; -$lang->execution->PM = $lang->executionCommon . '负责人'; -$lang->execution->execPM = "{$lang->execution->common}负责人"; -$lang->execution->QD = '测试负责人'; -$lang->execution->RD = '发布负责人'; -$lang->execution->release = '发布'; -$lang->execution->acl = '访问控制'; -$lang->execution->teamname = '团队名称'; -$lang->execution->order = $lang->executionCommon . '排序'; -$lang->execution->orderAB = '排序'; -$lang->execution->products = '相关' . $lang->productCommon; -$lang->execution->whitelist = '白名单'; -$lang->execution->addWhitelist = '添加白名单'; +$lang->execution->allExecutions = '所有' . $lang->executionCommon; +$lang->execution->allExecutionAB = "所有{$lang->execution->common}"; +$lang->execution->id = $lang->executionCommon . '编号'; +$lang->execution->type = $lang->executionCommon . '类型'; +$lang->execution->name = $lang->executionCommon . '名称'; +$lang->execution->code = $lang->executionCommon . '代号'; +$lang->execution->project = '所属项目'; +$lang->execution->execName = "{$lang->execution->common}名称"; +$lang->execution->execCode = "{$lang->execution->common}代号"; +$lang->execution->execType = "{$lang->execution->common}类型"; +$lang->execution->stage = '阶段'; +$lang->execution->pri = '优先级'; +$lang->execution->openedBy = '由谁创建'; +$lang->execution->openedDate = '创建日期'; +$lang->execution->closedBy = '由谁关闭'; +$lang->execution->closedDate = '关闭日期'; +$lang->execution->canceledBy = '由谁取消'; +$lang->execution->canceledDate = '取消日期'; +$lang->execution->begin = '开始日期'; +$lang->execution->end = '结束日期'; +$lang->execution->dateRange = '起始日期'; +$lang->execution->to = '至'; +$lang->execution->days = '可用工作日'; +$lang->execution->day = '天'; +$lang->execution->workHour = '工时'; +$lang->execution->workHourUnit = 'h'; +$lang->execution->totalHours = '可用工时'; +$lang->execution->totalDays = '可用工日'; +$lang->execution->status = $lang->executionCommon . '状态'; +$lang->execution->execStatus = "{$lang->execution->common}状态"; +$lang->execution->subStatus = '子状态'; +$lang->execution->desc = $lang->executionCommon . '描述'; +$lang->execution->execDesc = "{$lang->execution->common}描述"; +$lang->execution->owner = '负责人'; +$lang->execution->PO = $lang->productCommon . '负责人'; +$lang->execution->PM = $lang->executionCommon . '负责人'; +$lang->execution->execPM = "{$lang->execution->common}负责人"; +$lang->execution->QD = '测试负责人'; +$lang->execution->RD = '发布负责人'; +$lang->execution->release = '发布'; +$lang->execution->acl = '访问控制'; +$lang->execution->teamname = '团队名称'; +$lang->execution->order = $lang->executionCommon . '排序'; +$lang->execution->orderAB = '排序'; +$lang->execution->products = '相关' . $lang->productCommon; +$lang->execution->whitelist = '白名单'; +$lang->execution->addWhitelist = '添加白名单'; $lang->execution->unbindWhitelist = '删除白名单'; -$lang->execution->totalEstimate = '预计'; -$lang->execution->totalConsumed = '消耗'; -$lang->execution->totalLeft = '剩余'; -$lang->execution->progress = '进度'; -$lang->execution->hours = '预计 %s 消耗 %s 剩余 %s'; -$lang->execution->viewBug = '查看bug'; -$lang->execution->noProduct = "无{$lang->executionCommon}"; -$lang->execution->createStory = "提{$lang->SRCommon}"; -$lang->execution->storyTitle = "{$lang->SRCommon}名称"; -$lang->execution->all = '所有'; -$lang->execution->undone = '未完成'; -$lang->execution->unclosed = '未关闭'; -$lang->execution->typeDesc = "运维{$lang->executionCommon}没有{$lang->SRCommon}、bug、版本、测试功能。"; -$lang->execution->mine = '我负责：'; -$lang->execution->involved = '我参与：'; -$lang->execution->other = '其他：'; -$lang->execution->deleted = '已删除'; -$lang->execution->delayed = '已延期'; -$lang->execution->product = $lang->execution->products; -$lang->execution->readjustTime = "调整{$lang->executionCommon}起止时间"; -$lang->execution->readjustTask = '顺延任务的起止时间'; -$lang->execution->effort = '日志'; -$lang->execution->relatedMember = '相关成员'; -$lang->execution->watermark = '由禅道导出'; -$lang->execution->burnXUnit = '(日期)'; -$lang->execution->burnYUnit = '(工时)'; -$lang->execution->waitTasks = '待处理'; -$lang->execution->viewByUser = '按用户查看'; -$lang->execution->oneProduct = "阶段只能关联一个{$lang->productCommon}"; -$lang->execution->noLinkProduct = "阶段没有关联{$lang->productCommon}"; -$lang->execution->recent = '近期访问：'; +$lang->execution->totalEstimate = '预计'; +$lang->execution->totalConsumed = '消耗'; +$lang->execution->totalLeft = '剩余'; +$lang->execution->progress = '进度'; +$lang->execution->hours = '预计 %s 消耗 %s 剩余 %s'; +$lang->execution->viewBug = '查看bug'; +$lang->execution->noProduct = "无{$lang->executionCommon}"; +$lang->execution->createStory = "提{$lang->SRCommon}"; +$lang->execution->storyTitle = "{$lang->SRCommon}名称"; +$lang->execution->all = '所有'; +$lang->execution->undone = '未完成'; +$lang->execution->unclosed = '未关闭'; +$lang->execution->typeDesc = "运维{$lang->executionCommon}没有{$lang->SRCommon}、bug、版本、测试功能。"; +$lang->execution->mine = '我负责：'; +$lang->execution->involved = '我参与：'; +$lang->execution->other = '其他：'; +$lang->execution->deleted = '已删除'; +$lang->execution->delayed = '已延期'; +$lang->execution->product = $lang->execution->products; +$lang->execution->readjustTime = "调整{$lang->executionCommon}起止时间"; +$lang->execution->readjustTask = '顺延任务的起止时间'; +$lang->execution->effort = '日志'; +$lang->execution->relatedMember = '相关成员'; +$lang->execution->watermark = '由禅道导出'; +$lang->execution->burnXUnit = '(日期)'; +$lang->execution->burnYUnit = '(工时)'; +$lang->execution->waitTasks = '待处理'; +$lang->execution->viewByUser = '按用户查看'; +$lang->execution->oneProduct = "阶段只能关联一个{$lang->productCommon}"; +$lang->execution->noLinkProduct = "阶段没有关联{$lang->productCommon}"; +$lang->execution->recent = '近期访问：'; +$lang->execution->copyNoExecution = '没有可用的' . $lang->executionCommon . '来复制'; $lang->execution->start = "开始"; $lang->execution->activate = "激活"; diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php index 8ce5187e40..e58434cc9d 100644 --- a/module/execution/view/create.html.php +++ b/module/execution/view/create.html.php @@ -180,7 +180,7 @@
-
execution->copyNoProject;?>
+
execution->copyNoExecution;?>
From 02d9e9f142be808cf4ed09dd0794e22315ab73c3 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 19 Apr 2021 17:22:44 +0800 Subject: [PATCH 4/5] * Fix bug #12242. --- module/group/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 17c8462223..da058bfbab 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -32,7 +32,7 @@ $lang->group->productList = '可访问' . $lang->productCommon; $lang->group->projectList = '可访问项目'; $lang->group->dynamic = '可查看动态'; $lang->group->noticeVisit = '空代表没有访问限制'; -$lang->group->noneProgram = "暂时没有项目"; +$lang->group->noneProgram = "暂时没有项目集"; $lang->group->noneProduct = "暂时没有{$lang->productCommon}"; $lang->group->noneProject = "暂时没有{$lang->executionCommon}"; From e0f229166692ba7b53f5016b0096116f76a37f0f Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Tue, 20 Apr 2021 09:42:20 +0800 Subject: [PATCH 5/5] * Fix bug#12036. --- module/execution/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/execution/control.php b/module/execution/control.php index 20495cd171..ff80468283 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1312,7 +1312,7 @@ class execution extends control $this->view->title = (($this->app->openApp == 'execution') and ($this->config->systemMode == 'new')) ? $this->lang->execution->createExec : $this->lang->execution->create; $this->view->position[] = $this->view->title; - $this->view->executions = array('' => '') + $this->execution->getList(); + $this->view->executions = array('' => '') + $this->execution->getList($projectID); $this->view->groups = $this->loadModel('group')->getPairs(); $this->view->allProducts = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($projectID); $this->view->acl = $acl;