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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2018-01-11 16:59:50 +08:00
parent 4cc371b757 87807110d5
commit e75acb4b95
23 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/lang/en.php
+3 -3
View File
@@ -220,7 +220,7 @@ $lang->bug->browserList['other'] = 'Other';
$lang->bug->typeList[''] = '';
$lang->bug->typeList['codeerror'] = 'Code Error';
$lang->bug->typeList['interface'] = 'Interface Optimization';
$lang->bug->typeList['interface'] = 'UI Optimization';
$lang->bug->typeList['config'] = 'Configuration';
$lang->bug->typeList['install'] = 'Install/Deploy';
$lang->bug->typeList['security'] = 'Security';
@@ -255,9 +255,9 @@ $lang->bug->resolutionList['tostory'] = 'Converted to Story';
$lang->bug->report = new stdclass();
$lang->bug->report->common = 'Report';
$lang->bug->report->select = 'Select Report Type ';
$lang->bug->report->create = 'Generate a Report';
$lang->bug->report->create = 'Generate Report';
$lang->bug->report->charts['bugsPerProject'] = $lang->projectCommon . 'Bugs';
$lang->bug->report->charts['bugsPerProject'] = $lang->projectCommon . ' Bugs';
$lang->bug->report->charts['bugsPerBuild'] = 'Bugs Per Build';
$lang->bug->report->charts['bugsPerModule'] = 'Bugs Per Module';
$lang->bug->report->charts['openedBugsPerDay'] = 'Reported Bugs Per Day';
module/bug/view/resolve.html.php
+1 -1
View File
@@ -28,7 +28,7 @@ js::set('productID' , $bug->product);
<form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->bug->resolution;?></th>
<th class='w-100px'><?php echo $lang->bug->resolution;?></th>
<td class='w-p35-f'><?php echo html::select('resolution', $lang->bug->resolutionList, '', 'class=form-control onchange=setDuplicate(this.value)');?></td>
<td></td>
</tr>
module/custom/lang/en.php
+1 -1
View File
@@ -45,7 +45,7 @@ $lang->custom->task->fields['hours'] = 'Man-hours';
$lang->custom->bug = new stdClass();
$lang->custom->bug->fields['priList'] = 'Priority';
$lang->custom->bug->fields['severityList'] = 'Priority';
$lang->custom->bug->fields['severityList'] = 'Severity';
$lang->custom->bug->fields['osList'] = 'OS';
$lang->custom->bug->fields['browserList'] = 'Browser';
$lang->custom->bug->fields['typeList'] = 'Type';
module/custom/view/set.html.php
+4 -4
View File
@@ -50,20 +50,20 @@ EOT;
<?php if(($module == 'story' or $module == 'testcase') and $field == 'review'):?>
<table class='table table-form mw-800px'>
<tr>
<th class='w-80px'><?php echo $lang->custom->storyReview;?></th>
<th class='w-120px'><?php echo $lang->custom->storyReview;?></th>
<td><?php echo html::radio('needReview', $lang->custom->reviewList, $needReview);?></td>
<td></td>
<td class='w-100px'></td>
</tr>
<tr <?php if($needReview and $module == 'testcase') echo "class='hidden'"?>>
<th><?php echo $lang->custom->forceReview;?></th>
<td><?php echo html::select('forceReview[]', $users, $forceReview, "class='form-control chosen' multiple");?></td>
<td class='w-180px'><?php printf($lang->custom->notice->forceReview, $lang->$module->common);?></td>
<td style='width:300px'><?php printf($lang->custom->notice->forceReview, $lang->$module->common);?></td>
</tr>
<?php if($module == 'testcase'):?>
<tr <?php if(!$needReview) echo "class='hidden'"?>>
<th><?php echo $lang->custom->forceNotReview;?></th>
<td><?php echo html::select('forceNotReview[]', $users, $forceNotReview, "class='form-control chosen' multiple");?></td>
<td class='w-180px'><?php printf($lang->custom->notice->forceNotReview, $lang->$module->common);?></td>
<td style='width:300px'><?php printf($lang->custom->notice->forceNotReview, $lang->$module->common);?></td>
</tr>
<?php endif;?>
<tr>
module/doc/view/create.html.php
+1 -1
View File
@@ -24,7 +24,7 @@
<form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->doc->module;?></th>
<th class='w-100px'><?php echo $lang->doc->module;?></th>
<td class='w-400px'>
<?php echo html::hidden('lib', $libID);?>
<span id='moduleBox'><?php echo html::select('module', $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></span>
module/group/lang/en.php
+1 -1
View File
@@ -11,7 +11,7 @@
*/
$lang->group->common = 'Groups';
$lang->group->browse = 'Browse Groups';
$lang->group->create = 'Create Group';
$lang->group->create = 'Add Group';
$lang->group->edit = 'Edit';
$lang->group->copy = 'Copy';
$lang->group->delete = 'Delete';
module/group/view/manageview.html.php
+1 -1
View File
@@ -21,7 +21,7 @@
<form class='form-condensed' method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-150px'>
<th class='w-180px'>
<?php echo $lang->group->viewList;?>
</th>
<td class='w-p60'>
module/project/view/view.html.php
+1 -1
View File
@@ -74,7 +74,7 @@
<legend><?php echo $lang->project->basicInfo?></legend>
<table class='table table-data table-condensed table-borderless'>
<tr>
<th class='w-80px text-right strong'><?php echo $lang->project->name;?></th>
<th class='w-100px text-right strong'><?php echo $lang->project->name;?></th>
<td><?php echo $project->name;?></td>
</tr>
<tr>
module/report/lang/en.php
+3 -3
View File
@@ -48,9 +48,9 @@ $lang->report->beginAndEnd = ' From';
$lang->report->dept = 'Dept';
$lang->report->deviationChart = $lang->projectCommon . ' Deviation Chart';
$lang->reportList->project->lists[10] = $lang->projectCommon . ' deviation|report|projectdeviation';
$lang->reportList->product->lists[10] = $lang->productCommon . ' summary|report|productsummary';
$lang->reportList->test->lists[10] = 'Bugs|report|bugcreate';
$lang->reportList->project->lists[10] = $lang->projectCommon . ' Deviation|report|projectdeviation';
$lang->reportList->product->lists[10] = $lang->productCommon . ' Summary|report|productsummary';
$lang->reportList->test->lists[10] = 'Bugs Creation|report|bugcreate';
$lang->reportList->test->lists[13] = 'Bug Assignment|report|bugassign';
$lang->reportList->staff->lists[10] = 'Workload|report|workload';
module/report/view/bugcreate.html.php
+1 -1
View File
@@ -45,7 +45,7 @@
<th class="w-100px"><?php echo $lang->bug->resolutionList['notrepro'];?></th>
<th><?php echo $lang->bug->resolutionList['postponed'];?></th>
<th class="w-120px"><?php echo $lang->bug->resolutionList['willnotfix'];?></th>
<th class="w-120px"><?php echo $lang->bug->resolutionList['tostory'];?></th>
<th class="w-130px"><?php echo $lang->bug->resolutionList['tostory'];?></th>
<th title='<?php echo $lang->report->validRateTips;?>'><?php echo $lang->report->validRate;?></th>
<th><?php echo $lang->report->total;?></th>
</tr>
module/report/view/workload.html.php
+3 -3
View File
@@ -26,9 +26,9 @@
<div class='col-sm-4'>
<div class='input-group input-group-sm'>
<span class='input-group-addon'><?php echo $lang->report->taskAssignedDate;?></span>
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('begin', $begin, "class='w-100px form-control' onchange='changeParams(this)'");?></div>
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('begin', $begin, "class='w-80px form-control' style='padding-right:10px' onchange='changeParams(this)'");?></div>
<span class='input-group-addon fix-border'><?php echo $lang->report->to;?></span>
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('end', $end, "class='form-control' onchange='changeParams(this)'");?></div>
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('end', $end, "class='form-control' style='padding-right:10px' onchange='changeParams(this)'");?></div>
</div>
</div>
<div class='col-sm-2'>
@@ -44,7 +44,7 @@
</div>
</div>
<div class='col-sm-1'>
<?php echo html::select('assign', $lang->report->isAssign, $assign, "class='form-control' onchange='changeParams(this)'");?>
<?php echo html::select('assign', $lang->report->isAssign, $assign, "class='form-control' onchange='changeParams(this)' style='width:90px'");?>
</div>
<div class='col-sm-1'>
<div class='input-group'><?php echo html::submitButton($lang->report->query);?></div>
module/story/lang/en.php
+1 -1
View File
@@ -142,7 +142,7 @@ $lang->story->sourceList['po'] = $lang->productCommon . ' Owner';
$lang->story->sourceList['market'] = 'Marketing';
$lang->story->sourceList['service'] = 'Customer Service';
$lang->story->sourceList['operation'] = 'Operations';
$lang->story->sourceList['support'] = 'Technical support';
$lang->story->sourceList['support'] = 'Technical Support';
$lang->story->sourceList['competitor'] = 'Competitor';
$lang->story->sourceList['partner'] = 'Partner';
$lang->story->sourceList['dev'] = 'Dev Team';
module/task/lang/en.php
+1 -1
View File
@@ -11,7 +11,7 @@
*/
$lang->task->index = "Index";
$lang->task->create = "Create Task";
$lang->task->batchCreate = "Batch Create Task";
$lang->task->batchCreate = "Batch Create Tasks";
$lang->task->batchEdit = "Batch Edit";
$lang->task->batchChangeModule = "Batch Change Module";
$lang->task->batchClose = "Batch Close";
module/testcase/config.php
+3 -3
View File
@@ -148,7 +148,7 @@ $config->testcase->datatable->fieldList['lastRunner']['required'] = 'no';
$config->testcase->datatable->fieldList['lastRunDate']['title'] = 'lastRunDate';
$config->testcase->datatable->fieldList['lastRunDate']['fixed'] = 'no';
$config->testcase->datatable->fieldList['lastRunDate']['width'] = '120';
$config->testcase->datatable->fieldList['lastRunDate']['width'] = '100';
$config->testcase->datatable->fieldList['lastRunDate']['required'] = 'no';
$config->testcase->datatable->fieldList['lastRunResult']['title'] = 'lastRunResult';
@@ -158,7 +158,7 @@ $config->testcase->datatable->fieldList['lastRunResult']['required'] = 'no';
$config->testcase->datatable->fieldList['status']['title'] = 'statusAB';
$config->testcase->datatable->fieldList['status']['fixed'] = 'no';
$config->testcase->datatable->fieldList['status']['width'] = '100';
$config->testcase->datatable->fieldList['status']['width'] = '80';
$config->testcase->datatable->fieldList['status']['required'] = 'no';
$config->testcase->datatable->fieldList['lastEditedBy']['title'] = 'lastEditedBy';
@@ -204,6 +204,6 @@ $config->testcase->datatable->fieldList['stepNumber']['name'] = $lang->testc
$config->testcase->datatable->fieldList['actions']['title'] = 'actions';
$config->testcase->datatable->fieldList['actions']['fixed'] = 'right';
$config->testcase->datatable->fieldList['actions']['width'] = '140';
$config->testcase->datatable->fieldList['actions']['width'] = '150';
$config->testcase->datatable->fieldList['actions']['required'] = 'yes';
$config->testcase->datatable->fieldList['actions']['sort'] = 'no';
module/testcase/lang/en.php
+3 -3
View File
@@ -73,7 +73,7 @@ $lang->testcase->stepVersion = 'Version';
$lang->testcase->common = 'Case';
$lang->testcase->index = "Home";
$lang->testcase->create = "Create Case";
$lang->testcase->batchCreate = "Batch Create Case";
$lang->testcase->batchCreate = "Batch Create Cases";
$lang->testcase->delete = "Delete";
$lang->testcase->view = "Overview";
$lang->testcase->review = "Review";
@@ -168,7 +168,7 @@ $lang->testcase->groups[''] = 'Group ';
$lang->testcase->groups['story'] = 'Story Group';
$lang->testcase->statusList[''] = '';
$lang->testcase->statusList['wait'] = 'toReview';
$lang->testcase->statusList['wait'] = 'ToReview';
$lang->testcase->statusList['normal'] = 'Normal';
$lang->testcase->statusList['blocked'] = 'Blocked';
$lang->testcase->statusList['investigate'] = 'Investigating';
@@ -183,7 +183,7 @@ $lang->testcase->buttonToList = 'Back';
$lang->testcase->errorEncode = 'No Data. Please select right encoding and upload again!';
$lang->testcase->noFunction = 'Iconv and mb_convert_encoding is not found. You cannot convert the data into the desired one!';
$lang->testcase->noRequire = "Row %s has“%s”which is a required field and it should not be blank.";
$lang->testcase->noLibrary = "No library exists. Create one first！";
$lang->testcase->noLibrary = "No library exists. Please create one first.";
$lang->testcase->mustChooseResult = 'Review result is required.';
$lang->testcase->searchStories = 'Enter to searcu Story';
module/testreport/lang/en.php
+5 -5
View File
@@ -1,7 +1,7 @@
<?php
$lang->testreport->common = 'Test Report';
$lang->testreport->browse = 'Browser Reports';
$lang->testreport->create = 'Create Report';
$lang->testreport->browse = 'Test Statements';
$lang->testreport->create = 'Create Statements';
$lang->testreport->edit = 'Edit Report';
$lang->testreport->delete = 'Delete';
$lang->testreport->export = 'Export';
@@ -46,8 +46,8 @@ $lang->testreport->legendMore = 'More';
$lang->testreport->bugSeverityGroups = 'Bug Severity Distribution';
$lang->testreport->bugTypeGroups = 'Bug Type Distribution';
$lang->testreport->bugStatusGroups = 'Bug Status Distribution';
$lang->testreport->bugOpenedByGroups = 'Bug CreatedBy Distribution';
$lang->testreport->bugResolvedByGroups = 'Bug ResolvedBy Distribution';
$lang->testreport->bugOpenedByGroups = 'Bug Creator Distribution';
$lang->testreport->bugResolvedByGroups = 'Bug Solver Distribution';
$lang->testreport->bugResolutionGroups = 'Bug Resolution Distribution';
$lang->testreport->bugModuleGroups = 'Bug Module Distribution';
$lang->testreport->legacyBugs = 'Legacy Bugs';
@@ -59,7 +59,7 @@ $lang->testreport->buildSummary = 'Tested <strong>%s</strong> build.';
$lang->testreport->confirmDelete = 'Do you want tot delete this report?';
$lang->testreport->moreNotice = 'More features can be extended with reference to the ZenTao extension mechanism, or you can contact us for customization.';
$lang->testreport->exportNotice = "Export By <a href='http://www.zentao.net' target='_blank' style='color:grey'>ZenTaoPMS</a>";
$lang->testreport->noReport = "The report has not yet been generated. Please check it later.";
$lang->testreport->noReport = "No statements has been generated. Please check it later.";
$lang->testreport->foundBugTip = "Bugs created in this build and created in the test period.";
$lang->testreport->legacyBugTip = "Active Bugs, or the resolved beyond the test period.";
$lang->testreport->fromCaseBugTip = "Bugs created after case-failure in the test period.";
module/testreport/view/browse.html.php
+1 -1
View File
@@ -26,7 +26,7 @@
<th class='w-120px'><?php common::printOrderLink('createdDate', $orderBy, $vars, $lang->testreport->createdDate);?></th>
<th class='w-250px'><?php common::printOrderLink('project', $orderBy, $vars, $lang->testreport->project);?></th>
<th class='w-250px'><?php echo $lang->testreport->testtask;?></th>
<th class='w-50px'> <?php echo $lang->actions;?></th>
<th class='w-60px'> <?php echo $lang->actions;?></th>
</tr>
</thead>
<?php if($reports):?>
module/testsuite/lang/en.php
+1 -1
View File
@@ -21,7 +21,7 @@ $lang->testsuite->unlinkCase = "Unlink";
$lang->testsuite->batchUnlinkCases = "Batch unlink cases";
$lang->testsuite->deleted = 'deleted';
$lang->testsuite->exportTemplet = 'Export template';
$lang->testsuite->batchCreateCase = 'Batch create case';
$lang->testsuite->batchCreateCase = 'Batch create cases';
$lang->testsuite->import = 'Import';
$lang->testsuite->showImport = 'Show import data';
module/testsuite/view/linkcase.html.php
+1 -1
View File
@@ -32,7 +32,7 @@
<thead>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th class='w-60px'><nobr><?php echo $lang->testsuite->linkVersion;?></nobr></th>
<th class='w-70px'><nobr><?php echo $lang->testsuite->linkVersion;?></nobr></th>
<th class='w-pri'><?php echo $lang->priAB;?></th>
<th><?php echo $lang->testcase->title;?></th>
<th class='w-type'><?php echo $lang->testcase->type;?></th>
module/testtask/lang/en.php
+4 -4
View File
@@ -42,7 +42,7 @@ $lang->testtask->totalStatus = "All";
$lang->testtask->all = "All " . $lang->productCommon;
$lang->testtask->id = 'ID';
$lang->testtask->common = 'Test build';
$lang->testtask->common = 'Test Task';
$lang->testtask->product = $lang->productCommon;
$lang->testtask->project = $lang->projectCommon;
$lang->testtask->build = 'Build';
@@ -59,7 +59,7 @@ $lang->testtask->linkVersion = 'Version';
$lang->testtask->lastRunAccount = 'Runner';
$lang->testtask->lastRunTime = 'Last Run';
$lang->testtask->lastRunResult = 'Result';
$lang->testtask->reportField = 'Report';
$lang->testtask->reportField = 'Statements';
$lang->testtask->files = 'Upload';
$lang->testtask->case = 'Case';
$lang->testtask->version = 'Version';
@@ -141,8 +141,8 @@ $lang->testtask->report->charts['testTaskPerModule'] = 'Module Report';
$lang->testtask->report->charts['testTaskPerRunner'] = 'Runner Report';
$lang->testtask->report->charts['bugSeverityGroups'] = 'Bug Severity Distribution';
$lang->testtask->report->charts['bugStatusGroups'] = 'Bug Status Distribution';
$lang->testtask->report->charts['bugOpenedByGroups'] = 'Bug CreatedBy Distribution';
$lang->testtask->report->charts['bugResolvedByGroups'] = 'Bug ResolvedBy Distribution';
$lang->testtask->report->charts['bugOpenedByGroups'] = 'Bug Creator Distribution';
$lang->testtask->report->charts['bugResolvedByGroups'] = 'Bug Solver Distribution';
$lang->testtask->report->charts['bugResolutionGroups'] = 'Bug Resolution Distribution';
$lang->testtask->report->charts['bugModuleGroups'] = 'Bug Module Distribution';
module/todo/lang/en.php
+5 -5
View File
@@ -65,14 +65,14 @@ $lang->todo->statusList['done'] = 'Done';
//$lang->todo->statusList['cancel'] = 'Cancelled';
//$lang->todo->statusList['postpone'] = 'Delayed';
$lang->todo->priList[3] = '3';
$lang->todo->priList[1] = '1';
$lang->todo->priList[2] = '2';
$lang->todo->priList[4] = '4';
$lang->todo->priList[3] = 'Normal';
$lang->todo->priList[1] = 'Highest';
$lang->todo->priList[2] = 'High';
$lang->todo->priList[4] = 'Low';
$lang->todo->priList[0] = '';
$lang->todo->typeList['custom'] = 'Custom';
$lang->todo->typeList['cycle'] = 'Cycle';
$lang->todo->typeList['cycle'] = 'Periodic';
$lang->todo->typeList['bug'] = 'Bug';
$lang->todo->typeList['task'] = $lang->projectCommon . 'Task';
$lang->todo->typeList['story'] = $lang->projectCommon . 'Story';
module/user/lang/en.php
+1 -1
View File
@@ -95,7 +95,7 @@ $lang->user->errorDeny = "Sorry, your access to <b>%s</b> Module <b>%s</b> Fe
$lang->user->loginFailed = "Login failed. Please check your account and password.";
$lang->user->lockWarning = "You can try %s times.";
$lang->user->loginLocked = "Please contact the administrator to unlock your account or try %s mins later.";
$lang->user->weakPassword = "Your password does meet the setting requirements.";
$lang->user->weakPassword = "Your password does not meet the setting requirements.";
$lang->user->roleList[''] = '';
$lang->user->roleList['dev'] = 'Developer';
module/user/view/create.html.php
+1 -1
View File
@@ -26,7 +26,7 @@
<form class='form-condensed mw-700px' method='post' target='hiddenwin' id='dataform'>
<table align='center' class='table table-form'>
<tr>
<th class='w-120px'><?php echo $lang->user->dept;?></th>
<th class='w-110px'><?php echo $lang->user->dept;?></th>
<td class='w-p50'><?php echo html::select('dept', $depts, $deptID, "class='form-control chosen'");?></td>
</tr>
<tr>