diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 023cfe3c34..3cc07c107c 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -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'; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 20487afb6e..7bece3c197 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -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'; diff --git a/module/bug/config.php b/module/bug/config.php index 9fe7648fd6..b22037a6c8 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -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'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 6a073f9d0b..420cc2628d 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -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 %s bugs on this page, and %s unsolved."; +$lang->bug->summary = "Total %s bugs on this page, and %s 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 = "

[Steps]


"; @@ -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 $actor and the solution is $extra $appendLink.', 'extra' => 'resolutionList'); +$lang->bug->action->resolved = array('main' => '$date, resolved by $actor and the resolution is $extra $appendLink.', 'extra' => 'resolutionList'); $lang->bug->action->tostory = array('main' => '$date, converted by $actor to Story with ID $extra.'); $lang->bug->action->totask = array('main' => '$date, imported by $actor as Task with ID $extra.'); $lang->bug->action->linked2plan = array('main' => '$date, linked by $actor to Plan $extra.'); diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 6892d99027..ca3c072ad9 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -99,7 +99,7 @@
- getClientLang() == 'en' ? 'w-80px' : 'w-70px';?> + getClientLang() == 'en' ? 'w-110px' : 'w-70px';?> diff --git a/module/build/lang/en.php b/module/build/lang/en.php index ce37c7c254..d2529c8dec 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -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 = " This {$lang->projectCommon} is not linked to {$lang->productCommon}, so the Build cannot be created. Please first link {$lang->productCommon}"; $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(); diff --git a/module/common/lang/en.php b/module/common/lang/en.php index a2688a5162..3e71e394d9 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -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¶m=%s'; $lang->bug->menu->openedbyme = 'ReportedByMe|bug|browse|productID=%s&branch=%s&browseType=openedbyme¶m=%s'; $lang->bug->menu->assigntome = 'AssignedToMe|bug|browse|productID=%s&branch=%s&browseType=assigntome¶m=%s'; - $lang->bug->menu->resolvedbyme = 'SolvedByMe|bug|browse|productID=%s&branch=%s&browseType=resolvedbyme¶m=%s'; + $lang->bug->menu->resolvedbyme = 'ResolvedByMe|bug|browse|productID=%s&branch=%s&browseType=resolvedbyme¶m=%s'; $lang->bug->menu->toclosed = 'ToBeClosed|bug|browse|productID=%s&branch=%s&browseType=toclosed¶m=%s'; - $lang->bug->menu->unresolved = 'Unsolved|bug|browse|productID=%s&branch=%s&browseType=unresolved¶m=%s'; + $lang->bug->menu->unresolved = 'Unresolved|bug|browse|productID=%s&branch=%s&browseType=unresolved¶m=%s'; $lang->bug->menu->more = array('link' => 'More|bug|browse|productID=%s&branch=%s&browseType=unconfirmed¶m=%s', 'class' => 'dropdown dropdown-hover'); $lang->bug->subMenu = new stdclass(); diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index ae9d5adfaa..689091b0db 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -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'; diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index 72500510d8..ec482e5f9d 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -48,8 +48,8 @@ - - + + diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php index 6fc0fd6cf2..5bef9ba728 100644 --- a/module/project/view/bug.html.php +++ b/module/project/view/bug.html.php @@ -56,8 +56,8 @@ - - + + diff --git a/module/release/lang/en.php b/module/release/lang/en.php index dd8c8cd19e..1d5f9f7303 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -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'; diff --git a/module/report/lang/en.php b/module/report/lang/en.php index be0669e6f0..a26cf9525a 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -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'; diff --git a/module/score/lang/en.php b/module/score/lang/en.php index 384dca4e6c..6dedebfdb2 100644 --- a/module/score/lang/en.php +++ b/module/score/lang/en.php @@ -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'; diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php index 6144506cd3..808449c3b4 100644 --- a/module/testreport/lang/en.php +++ b/module/testreport/lang/en.php @@ -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 %s cases. %s cases run. %s results generated. %s cases failed.'; @@ -63,7 +63,7 @@ $lang->testreport->moreNotice = 'More features can be extended with referenc $lang->testreport->exportNotice = "Exported By ZenTao"; $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 = <<%s Bugs reported , -%s Bugs remained unsolved , +%s Bugs remained unresolved , %s Bugs generated due to the failure of case run . -Bug Effective Rate : %s,Bugs reported from case rate: %s +Bug Effective Rate : %s,Bugs reported from case rate: %s EOD; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index f8923de09b..f2598075af 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -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(); diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 939bea035f..fb008526c8 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -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'; diff --git a/module/user/view/bug.html.php b/module/user/view/bug.html.php index 7f5c6babd7..ad547f9ab3 100644 --- a/module/user/view/bug.html.php +++ b/module/user/view/bug.html.php @@ -36,15 +36,15 @@
bug->title);?> openedByAB);?> bug->assignedTo);?> bug->resolvedByAB);?>bug->resolutionAB);?> bug->resolvedByAB);?>bug->resolutionAB);?> actions;?>
bug->title);?> openedByAB);?> assignedToAB);?> bug->resolvedBy);?>bug->resolutionAB);?>bug->resolvedBy);?>bug->resolutionAB);?> actions;?>
- + - + - - + +
idAB;?> bug->severityAB;?> priAB;?> typeAB;?>bug->title;?>bug->title;?> openedByAB;?>bug->resolvedBy;?>bug->resolutionAB;?>bug->resolvedBy;?>bug->resolutionAB;?>