Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* finish task #6025.

Browse Source
This commit is contained in:
wangyidong
2019-07-05 15:35:13 +08:00
parent 3c102bb3e9
commit dc87304782
17 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+1 -1
View File
@@ -295,7 +295,7 @@ $lang->action->dynamicAction->bug['activated'] = 'Activate Bug';
$lang->action->dynamicAction->bug['assigned'] = 'Assign Bug';
$lang->action->dynamicAction->bug['closed'] = 'Close Bug';
$lang->action->dynamicAction->bug['bugconfirmed'] = 'Confirm Bug';
$lang->action->dynamicAction->bug['resolved'] = 'Solve Bug';
$lang->action->dynamicAction->bug['resolved'] = 'Resolve Bug';
$lang->action->dynamicAction->bug['undeleted'] = 'Restore Bug';
$lang->action->dynamicAction->bug['hidden'] = 'Hide Bug';
$lang->action->dynamicAction->bug['confirmed'] = 'Confirm Story Change';
module/block/lang/en.php
+1 -1
View File
@@ -340,7 +340,7 @@ $lang->block->typeList->task['canceledBy'] = 'CancelledByMe';
$lang->block->typeList->bug['assignedTo'] = 'AssignedToMe';
$lang->block->typeList->bug['openedBy'] = 'CreatedByMe';
$lang->block->typeList->bug['resolvedBy'] = 'SolvedByMe';
$lang->block->typeList->bug['resolvedBy'] = 'ResolvedByMe';
$lang->block->typeList->bug['closedBy'] = 'ClosedByMe';
$lang->block->typeList->case['assigntome'] = 'AssignedToMe';
module/bug/config.php
+3 -3
View File
@@ -289,17 +289,17 @@ $config->bug->datatable->fieldList['deadline']['required'] = 'no';
$config->bug->datatable->fieldList['resolvedBy']['title'] = 'resolvedByAB';
$config->bug->datatable->fieldList['resolvedBy']['fixed'] = 'no';
$config->bug->datatable->fieldList['resolvedBy']['width'] = '70';
$config->bug->datatable->fieldList['resolvedBy']['width'] = '100';
$config->bug->datatable->fieldList['resolvedBy']['required'] = 'no';
$config->bug->datatable->fieldList['resolution']['title'] = 'resolutionAB';
$config->bug->datatable->fieldList['resolution']['fixed'] = 'no';
$config->bug->datatable->fieldList['resolution']['width'] = '80';
$config->bug->datatable->fieldList['resolution']['width'] = '100';
$config->bug->datatable->fieldList['resolution']['required'] = 'no';
$config->bug->datatable->fieldList['resolvedDate']['title'] = 'resolvedDateAB';
$config->bug->datatable->fieldList['resolvedDate']['fixed'] = 'no';
$config->bug->datatable->fieldList['resolvedDate']['width'] = '90';
$config->bug->datatable->fieldList['resolvedDate']['width'] = '120';
$config->bug->datatable->fieldList['resolvedDate']['required'] = 'no';
$config->bug->datatable->fieldList['resolvedBuild']['title'] = 'resolvedBuild';
module/bug/lang/en.php
+8 -8
View File
@@ -48,12 +48,12 @@ $lang->bug->assignBug = 'AssignedTo';
$lang->bug->assignedToAB = 'AssignedTo';
$lang->bug->assignedDate = 'AssignedDate';
$lang->bug->resolvedBy = 'ResolvedBy';
$lang->bug->resolvedByAB = 'SolvedBy';
$lang->bug->resolvedByAB = 'ResolvedBy';
$lang->bug->resolution = 'Resolution';
$lang->bug->resolutionAB = 'Solution';
$lang->bug->resolutionAB = 'Resolution';
$lang->bug->resolvedBuild = 'Build';
$lang->bug->resolvedDate = 'Resolved Date';
$lang->bug->resolvedDateAB = 'SolvedDate';
$lang->bug->resolvedDateAB = 'ResolvedDate';
$lang->bug->deadline = 'Deadline';
$lang->bug->plan = 'Plan';
$lang->bug->closedBy = 'ClosedBy';
@@ -159,11 +159,11 @@ $lang->bug->legendRelated = 'Related Info';
$lang->bug->buttonConfirm = 'Confirm';
/* 交互提示。*/
$lang->bug->summary = "Total <strong>%s</strong> bugs on this page, and <strong>%s</strong> unsolved.";
$lang->bug->summary = "Total <strong>%s</strong> bugs on this page, and <strong>%s</strong> unresolved.";
$lang->bug->confirmChangeProduct = "Any change to {$lang->productCommon} will cause linked {$lang->projectCommon}s, stories and tasks change. Do you want to do this?";
$lang->bug->confirmDelete = 'Do you want to delete this bug?';
$lang->bug->remindTask = 'This bug has been converted to a task. Do you want to update the status of Task(ID %s)?';
$lang->bug->skipClose = 'Bug %s is not solved. You cannot close it.';
$lang->bug->skipClose = 'Bug %s is not resolved. You cannot close it.';
/* 模板。*/
$lang->bug->tplStep = "<p>[Steps]</p><br/>";
@@ -244,7 +244,7 @@ $lang->bug->typeList['others'] = 'Others';
$lang->bug->statusList[''] = '';
$lang->bug->statusList['active'] = 'Active';
$lang->bug->statusList['resolved'] = 'Solved';
$lang->bug->statusList['resolved'] = 'Resolved';
$lang->bug->statusList['closed'] = 'Closed';
$lang->bug->confirmedList[1] = 'Yes';
@@ -254,7 +254,7 @@ $lang->bug->resolutionList[''] = '';
$lang->bug->resolutionList['bydesign'] = 'As Design';
$lang->bug->resolutionList['duplicate'] = 'Duplicated';
$lang->bug->resolutionList['external'] = 'External';
$lang->bug->resolutionList['fixed'] = 'Solved';
$lang->bug->resolutionList['fixed'] = 'Resolved';
$lang->bug->resolutionList['notrepro'] = 'Irreproducible';
$lang->bug->resolutionList['postponed'] = 'Postponed';
$lang->bug->resolutionList['willnotfix'] = "Won't Fix";
@@ -358,7 +358,7 @@ $lang->bug->report->bugHistories->graph->xAxisName = 'Handling Steps';
/* 操作记录。*/
$lang->bug->action = new stdclass();
$lang->bug->action->resolved = array('main' => '$date, resolved by <strong>$actor</strong> and the solution is <strong>$extra</strong> $appendLink.', 'extra' => 'resolutionList');
$lang->bug->action->resolved = array('main' => '$date, resolved by <strong>$actor</strong> and the resolution is <strong>$extra</strong> $appendLink.', 'extra' => 'resolutionList');
$lang->bug->action->tostory = array('main' => '$date, converted by <strong>$actor</strong> to <strong>Story</strong> with ID <strong>$extra</strong>.');
$lang->bug->action->totask = array('main' => '$date, imported by <strong>$actor</strong> as <strong>Task</strong> with ID <strong>$extra</strong>.');
$lang->bug->action->linked2plan = array('main' => '$date, linked by <strong>$actor</strong> to Plan <strong>$extra</strong>.');
module/bug/view/view.html.php
+1 -1
View File
@@ -99,7 +99,7 @@
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='legendBasicInfo'>
<?php $widthClass = $app->getClientLang() == 'en' ? 'w-80px' : 'w-70px';?>
<?php $widthClass = $app->getClientLang() == 'en' ? 'w-110px' : 'w-70px';?>
<table class="table table-data">
<tbody>
<tr valign='middle'>
module/build/lang/en.php
+2 -2
View File
@@ -43,13 +43,13 @@ $lang->build->packageType = 'Package Type';
$lang->build->unlinkStory = 'Unlink Story';
$lang->build->unlinkBug = 'Unlink Bug';
$lang->build->stories = 'Finished Stories';
$lang->build->bugs = 'Solved Bugs';
$lang->build->bugs = 'Resolved Bugs';
$lang->build->generatedBugs = 'Reported Bugs';
$lang->build->noProduct = " <span style='color:red'>This {$lang->projectCommon} is not linked to {$lang->productCommon}, so the Build cannot be created. Please first <a href='%s'> link {$lang->productCommon}</a></span>";
$lang->build->noBuild = 'No builds yet.';
$lang->build->finishStories = ' Finished Story %s';
$lang->build->resolvedBugs = ' Solved Bug %s';
$lang->build->resolvedBugs = ' Resolved Bug %s';
$lang->build->createdBugs = ' Reported Bug %s';
$lang->build->placeholder = new stdclass();
module/common/lang/en.php
+2 -2
View File
@@ -760,9 +760,9 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
$lang->bug->menu->unclosed = 'Open|bug|browse|productID=%s&branch=%s&browseType=unclosed&param=%s';
$lang->bug->menu->openedbyme = 'ReportedByMe|bug|browse|productID=%s&branch=%s&browseType=openedbyme&param=%s';
$lang->bug->menu->assigntome = 'AssignedToMe|bug|browse|productID=%s&branch=%s&browseType=assigntome&param=%s';
$lang->bug->menu->resolvedbyme = 'SolvedByMe|bug|browse|productID=%s&branch=%s&browseType=resolvedbyme&param=%s';
$lang->bug->menu->resolvedbyme = 'ResolvedByMe|bug|browse|productID=%s&branch=%s&browseType=resolvedbyme&param=%s';
$lang->bug->menu->toclosed = 'ToBeClosed|bug|browse|productID=%s&branch=%s&browseType=toclosed&param=%s';
$lang->bug->menu->unresolved = 'Unsolved|bug|browse|productID=%s&branch=%s&browseType=unresolved&param=%s';
$lang->bug->menu->unresolved = 'Unresolved|bug|browse|productID=%s&branch=%s&browseType=unresolved&param=%s';
$lang->bug->menu->more = array('link' => 'More|bug|browse|productID=%s&branch=%s&browseType=unconfirmed&param=%s', 'class' => 'dropdown dropdown-hover');
$lang->bug->subMenu = new stdclass();
module/custom/lang/en.php
+1 -1
View File
@@ -51,7 +51,7 @@ $lang->custom->bug->fields['severityList'] = 'Severity';
$lang->custom->bug->fields['osList'] = 'OS';
$lang->custom->bug->fields['browserList'] = 'Browser';
$lang->custom->bug->fields['typeList'] = 'Type';
$lang->custom->bug->fields['resolutionList'] = 'Solution';
$lang->custom->bug->fields['resolutionList'] = 'Resolution';
$lang->custom->bug->fields['statusList'] = 'Status';
$lang->custom->bug->fields['longlife'] = 'Pending Days';
module/my/view/bug.html.php
+2 -2
View File
@@ -48,8 +48,8 @@
<th> <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
<th class='w-90px'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-110px'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->bug->assignedTo);?></th>
<th class='w-90px'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
<th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='w-100px'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
<th class='w-100px'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='c-actions-5'> <?php echo $lang->actions;?></th>
</tr>
</thead>
module/project/view/bug.html.php
+2 -2
View File
@@ -56,8 +56,8 @@
<th> <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
<th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-110px c-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
<th class='c-user'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
<th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='w-100px'><?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
<th class='w-100px'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='c-actions-5'><?php echo $lang->actions;?></th>
</tr>
</thead>
module/release/lang/en.php
+6 -6
View File
@@ -44,12 +44,12 @@ $lang->release->last = 'Last Release';
$lang->release->unlinkStory = 'Unlink Story';
$lang->release->unlinkBug = 'Unlink Bug';
$lang->release->stories = 'Finished Story';
$lang->release->bugs = 'Solved Bug';
$lang->release->leftBugs = 'Unsolved Bug';
$lang->release->generatedBugs = 'Unsolved Bug';
$lang->release->bugs = 'Resolved Bug';
$lang->release->leftBugs = 'Unresolved Bug';
$lang->release->generatedBugs = 'Unresolved Bug';
$lang->release->finishStories = 'Finished %s Story';
$lang->release->resolvedBugs = 'Solved %s Bug';
$lang->release->createdBugs = 'Unsolved %s Bug';
$lang->release->resolvedBugs = 'Resolved %s Bug';
$lang->release->createdBugs = 'Unresolved %s Bug';
$lang->release->export = 'Export as HTML';
$lang->release->yesterday = 'Released Yesterday';
@@ -59,7 +59,7 @@ $lang->release->scmPath = 'SCM Path : ';
$lang->release->exportTypeList['all'] = 'All';
$lang->release->exportTypeList['story'] = 'Story';
$lang->release->exportTypeList['bug'] = 'Bug';
$lang->release->exportTypeList['leftbug'] = 'Unsolved Bug';
$lang->release->exportTypeList['leftbug'] = 'Unresolved Bug';
$lang->release->statusList[''] = '';
$lang->release->statusList['normal'] = 'Normal';
module/report/lang/en.php
+1 -1
View File
@@ -69,7 +69,7 @@ $lang->report->to = 'to';
$lang->report->taskTotal = "Total Tasks";
$lang->report->manhourTotal = "Total Hours";
$lang->report->validRate = "Valid Rate";
$lang->report->validRateTips = "Solution is Solved/Postponed or status is Solved/Closed.";
$lang->report->validRateTips = "Solution is Resolved/Postponed or status is Resolved/Closed.";
$lang->report->unplanned = 'Unplanned';
$lang->report->workday = 'Hours/Day';
$lang->report->diffDays = 'days';
module/score/lang/en.php
+1 -1
View File
@@ -67,7 +67,7 @@ $lang->score->methods['story']['close'] = 'Close Story';
$lang->score->methods['bug']['create'] = 'Report Bug';
$lang->score->methods['bug']['confirmBug'] = 'Confirm Bug';
$lang->score->methods['bug']['createFormCase'] = 'Report Bug form Case';
$lang->score->methods['bug']['resolve'] = 'Solve Bug';
$lang->score->methods['bug']['resolve'] = 'Resolve Bug';
$lang->score->methods['bug']['saveTplModal'] = 'Save Template';
$lang->score->methods['testtask']['runCase'] = 'Run Test Case';
$lang->score->methods['testcase']['create'] = 'Create Test Case';
module/testreport/lang/en.php
+6 -6
View File
@@ -49,11 +49,11 @@ $lang->testreport->bugSeverityGroups = 'Bug Severity Distribution';
$lang->testreport->bugTypeGroups = 'Bug Type Distribution';
$lang->testreport->bugStatusGroups = 'Bug Status Distribution';
$lang->testreport->bugOpenedByGroups = 'Bug ReportedBy Distribution';
$lang->testreport->bugResolvedByGroups = 'Bug SolvedBy Distribution';
$lang->testreport->bugResolutionGroups = 'Bug Solution Distribution';
$lang->testreport->bugResolvedByGroups = 'Bug ResolvedBy Distribution';
$lang->testreport->bugResolutionGroups = 'Bug Resolution Distribution';
$lang->testreport->bugModuleGroups = 'Bug Module Distribution';
$lang->testreport->legacyBugs = 'Left Bugs';
$lang->testreport->bugConfirmedRate = 'Confirmed-Bug Rate (Solution is fixed or postponed / status is solved or closed)';
$lang->testreport->bugConfirmedRate = 'Confirmed-Bug Rate (Resolution is fixed or postponed / status is resolved or closed)';
$lang->testreport->bugCreateByCaseRate = 'Bug-Reported-in-Case Rate (Bugs reported in cases / New added bugs)';
$lang->testreport->caseSummary = 'Total <strong>%s</strong> cases. <strong>%s</strong> cases run. <strong>%s</strong> results generated. <strong>%s</strong> cases failed.';
@@ -63,7 +63,7 @@ $lang->testreport->moreNotice = 'More features can be extended with referenc
$lang->testreport->exportNotice = "Exported By <a href='https://www.zentao.net' target='_blank' style='color:grey'>ZenTao</a>";
$lang->testreport->noReport = "No report has been generated. Please check it later.";
$lang->testreport->foundBugTip = "Bugs generated in this build and generated in the test period.";
$lang->testreport->legacyBugTip = "Active bugs, or solved bugs that are not in the test period.";
$lang->testreport->legacyBugTip = "Active bugs, or resolved bugs that are not in the test period.";
$lang->testreport->fromCaseBugTip = "Bugs generated due to the failed case run in the test period.";
$lang->testreport->errorTrunk = "You cannot create a Testing report for the trunk. Please modify the linked build!";
$lang->testreport->noTestTask = "该{$lang->productCommon}下还没有测试单，不能创建报告。请切换到有测试单的{$lang->productCommon}，再创建。";
@@ -72,7 +72,7 @@ $lang->testreport->moreProduct = "Testing reports can only be generated for t
$lang->testreport->bugSummary = <<<EOD
Total <strong>%s</strong> Bugs reported <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->foundBugTip}'><i class='icon-help'></i></a>,
<strong>%s</strong> Bugs remained unsolved <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->legacyBugTip}'><i class='icon-help'></i></a>,
<strong>%s</strong> Bugs remained unresolved <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->legacyBugTip}'><i class='icon-help'></i></a>,
<strong>%s</strong> Bugs generated due to the failure of case run <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-help'></i></a>.
Bug Effective Rate <a data-toggle='tooltip' class='text-warning' title='Solution is solved or delayed / status is solved or closed'><i class='icon-help'></i></a>: <strong>%s</strong>，Bugs reported from case rate<a data-toggle='tooltip' class='text-warning' title='Bugs created from cases / bugs'><i class='icon-help'></i></a>: <strong>%s</strong>
Bug Effective Rate <a data-toggle='tooltip' class='text-warning' title='Resolution is resolved or delayed / status is resolved or closed'><i class='icon-help'></i></a>: <strong>%s</strong>，Bugs reported from case rate<a data-toggle='tooltip' class='text-warning' title='Bugs created from cases / bugs'><i class='icon-help'></i></a>: <strong>%s</strong>
EOD;
module/testtask/lang/en.php
+2 -2
View File
@@ -147,8 +147,8 @@ $lang->testtask->report->charts['testTaskPerRunner'] = 'RunBy Report';
$lang->testtask->report->charts['bugSeverityGroups'] = 'Bug Severity Distribution';
$lang->testtask->report->charts['bugStatusGroups'] = 'Bug Status Distribution';
$lang->testtask->report->charts['bugOpenedByGroups'] = 'Bug ReportedBy Distribution';
$lang->testtask->report->charts['bugResolvedByGroups'] = 'Bug SolvedBy Distribution';
$lang->testtask->report->charts['bugResolutionGroups'] = 'Bug Solution Distribution';
$lang->testtask->report->charts['bugResolvedByGroups'] = 'Bug ResolvedBy Distribution';
$lang->testtask->report->charts['bugResolutionGroups'] = 'Bug Resolution Distribution';
$lang->testtask->report->charts['bugModuleGroups'] = 'Bug Module Distribution';
$lang->testtask->report->options = new stdclass();
module/user/lang/en.php
+2 -2
View File
@@ -97,7 +97,7 @@ $lang->user->dynamic = 'Dynamics';
$lang->user->openedBy = 'CreatedBy %s';
$lang->user->assignedTo = 'AssignedTo %s';
$lang->user->finishedBy = 'FinishedBy %s';
$lang->user->resolvedBy = 'SolvedBy %s';
$lang->user->resolvedBy = 'ResolvedBy %s';
$lang->user->closedBy = 'ClosedBy %s';
$lang->user->reviewedBy = 'ReviewedBy %s';
$lang->user->canceledBy = 'CancelledBy %s';
@@ -139,7 +139,7 @@ $lang->user->statusList['delete'] = 'Deleted';
$lang->user->personalData['createdTodo'] = 'Todos Created';
$lang->user->personalData['createdStory'] = 'Stories Created';
$lang->user->personalData['finishedTask'] = 'Tasks Finished';
$lang->user->personalData['resolvedBug'] = 'Bugs Solved';
$lang->user->personalData['resolvedBug'] = 'Bugs Resolved';
$lang->user->personalData['createdCase'] = 'Cases Created';
$lang->user->keepLogin['on'] = 'Keep Login';
module/user/view/bug.html.php
+4 -4
View File
@@ -36,15 +36,15 @@
<div class='main-table'>
<table class='table has-sort-head tablesorter'>
<thead>
<tr class='colhead'>
<tr class='text-center'>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th class='w-severity'><?php echo $lang->bug->severityAB;?></th>
<th class='w-pri'><?php echo $lang->priAB;?></th>
<th class='w-type'><?php echo $lang->typeAB;?></th>
<th><?php echo $lang->bug->title;?></th>
<th class='text-left'><?php echo $lang->bug->title;?></th>
<th class='w-90px'><?php echo $lang->openedByAB;?></th>
<th class='w-user'><?php echo $lang->bug->resolvedBy;?></th>
<th class='w-resolution'><?php echo $lang->bug->resolutionAB;?></th>
<th class='w-100px'><?php echo $lang->bug->resolvedBy;?></th>
<th class='w-100px'><?php echo $lang->bug->resolutionAB;?></th>
</tr>
</thead>
<tbody>