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

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

Browse Source
This commit is contained in:
reneeteng
2019-06-11 11:16:22 +08:00
parent 520d121bdf 3b54364860
commit d4b7a9ac4c
13 changed files with 35 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/branch/model.php
+2 -1
View File
@@ -107,12 +107,13 @@ class branchModel extends model
}
}
$space = $this->app->getClientLang() == 'en' ? ' ' : '';
foreach($products as $product)
{
if($product->type == 'normal') continue;
if(!isset($branchGroups[$product->id])) $branchGroups[$product->id] = array();
if(strpos($params, 'noempty') === false) $branchGroups[$product->id] = array('0' => $this->lang->branch->all . $this->lang->product->branchName[$product->type]) + $branchGroups[$product->id];
if(strpos($params, 'noempty') === false) $branchGroups[$product->id] = array('0' => $this->lang->branch->all . $space . $this->lang->product->branchName[$product->type]) + $branchGroups[$product->id];
}
return $branchGroups;
module/bug/lang/en.php
+1 -1
View File
@@ -85,7 +85,7 @@ $lang->bug->batchChangeBranch = 'Batch Modify Branch';
$lang->bug->batchClose = 'Batch Close';
$lang->bug->assignTo = 'Assign';
$lang->bug->batchAssignTo = 'Batch Assign';
$lang->bug->browse = 'Bugs';
$lang->bug->browse = 'Bug List';
$lang->bug->view = 'Bug Detail';
$lang->bug->resolve = 'Resolve Bug';
$lang->bug->batchResolve = 'Batch Resolve';
module/dept/lang/en.php
+1 -1
View File
@@ -10,7 +10,7 @@
* @link http://www.zentao.net
*/
$lang->dept->common = 'Department';
$lang->dept->manageChild = "Department";
$lang->dept->manageChild = "Child Department";
$lang->dept->edit = "Edit";
$lang->dept->delete = "Delete";
$lang->dept->parent = "Parent Dept";
module/doc/lang/en.php
+3 -3
View File
@@ -68,8 +68,8 @@ $lang->doc->index = 'Document Home';
$lang->doc->create = 'Create Document';
$lang->doc->edit = 'Edit Document';
$lang->doc->delete = 'Delete';
$lang->doc->browse = 'List';
$lang->doc->view = 'Detail';
$lang->doc->browse = 'Document List';
$lang->doc->view = 'Document Detail';
$lang->doc->diff = 'Diff';
$lang->doc->sort = 'Order';
$lang->doc->manageType = 'Manage Category';
@@ -86,7 +86,7 @@ $lang->doc->libType = 'Category';
$lang->doc->custom = 'Custom Document Library';
$lang->doc->customAB = 'Custom Doc Lib';
$lang->doc->createLib = 'Create Document Library';
$lang->doc->allLibs = 'Libraries';
$lang->doc->allLibs = 'Library List';
$lang->doc->objectLibs = "{$lang->productCommon}/{$lang->projectCommon} Libraries";
$lang->doc->showFiles = 'Attachments';
$lang->doc->editLib = 'Edit Document Library';
module/group/lang/resource.php
+1 -1
View File
@@ -587,7 +587,7 @@ $lang->resource->testtask->index = 'index';
$lang->resource->testtask->create = 'create';
$lang->resource->testtask->browse = 'browse';
$lang->resource->testtask->view = 'view';
$lang->resource->testtask->cases = 'lblCases';
$lang->resource->testtask->cases = 'cases';
$lang->resource->testtask->groupCase = 'groupCase';
$lang->resource->testtask->edit = 'edit';
$lang->resource->testtask->start = 'start';
module/group/view/privbygroup.html.php
+6 -3
View File
@@ -26,7 +26,8 @@
</tr>
</thead>
<tr class='<?php echo cycle('even, bg-gray');?>'>
<th class='text-right w-150px'><?php echo $lang->my->common;?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-160px' : 'w-150px';?>
<th class='text-right <?php echo $colWidth;?>'><?php echo $lang->my->common;?></th>
<td id='my' class='pv-10px'>
<div class='checkbox-primary'>
<input type='checkbox' name='actions[my][]' value='limited' <?php if(isset($groupPrivs['my']['limited'])) echo "checked";?> />
@@ -72,7 +73,8 @@
<table class='table table-hover table-striped table-bordered' id='privList'>
<thead>
<tr class='text-center'>
<th class='w-150px'><?php echo $lang->group->module;?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-160px' : 'w-150px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->group->module;?></th>
<th><?php echo $lang->group->method;?></th>
</tr>
</thead>
@@ -96,7 +98,8 @@
}
?>
<tr class='<?php echo cycle('even, bg-gray');?>'>
<th class='text-middle text-right w-150px'>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-160px' : 'w-150px';?>
<th class='text-middle text-right <?php echo $colWidth;?>'>
<div class="checkbox-primary checkbox-inline checkbox-right check-all">
<input type='checkbox' id='allChecker<?php echo $moduleName;?>'>
<label class='text-right' for='allChecker<?php echo $moduleName;?>'><?php echo $lang->$moduleName->common;?></label>
module/product/lang/en.php
+3 -3
View File
@@ -11,7 +11,7 @@
*/
$lang->product->common = $lang->productCommon;
$lang->product->index = $lang->productCommon . ' Home';
$lang->product->browse = 'Story';
$lang->product->browse = 'Story List';
$lang->product->dynamic = 'Dynamics';
$lang->product->view = 'Overview';
$lang->product->edit = "Edit {$lang->productCommon}";
@@ -39,9 +39,9 @@ $lang->product->projects = "Linked {$lang->projectCommon}";
$lang->product->cases = 'Case';
$lang->product->builds = 'Build';
$lang->product->roadmap = 'Roadmap';
$lang->product->doc = 'Doc';
$lang->product->doc = 'Documents';
$lang->product->project = $lang->projectCommon . ' List';
$lang->product->build = 'Build';
$lang->product->build = 'Build List';
$lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below.";
$lang->product->currentProject = "{$lang->projectCommon}";
module/productplan/lang/en.php
-76
View File
@@ -1,76 +0,0 @@
<?php
/**
* The productplan module English file of ZenTaoPMS.
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package productplan
* @version $Id: en.php 4659 2013-04-17 06:45:08Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->productplan->common = $lang->productCommon . ' Plan';
$lang->productplan->browse = "Plans";
$lang->productplan->index = "List";
$lang->productplan->create = "Create Plan";
$lang->productplan->edit = "Edit Plan";
$lang->productplan->delete = "Delete";
$lang->productplan->view = "Detail";
$lang->productplan->bugSummary = "Total <strong>%s</strong> bugs on this page.";
$lang->productplan->basicInfo = 'Basic Info';
$lang->productplan->batchEdit = 'Batch Edit';
$lang->productplan->batchUnlink = "Batch Unlink";
$lang->productplan->linkStory = "Link Story";
$lang->productplan->unlinkStory = "Unlink Story";
$lang->productplan->batchUnlinkStory = "Batch Unlink";
$lang->productplan->linkedStories = 'Linked Stories';
$lang->productplan->unlinkedStories = 'Unlinked Stories';
$lang->productplan->updateOrder = 'Rank';
$lang->productplan->createChildren = "Create Child Plans";
$lang->productplan->linkBug = "Link Bug";
$lang->productplan->unlinkBug = "Unlink Bug";
$lang->productplan->batchUnlinkBug = "Batch Unlink Bugs";
$lang->productplan->linkedBugs = 'Linked Bugs';
$lang->productplan->unlinkedBugs = 'Unlinked Bugs';
$lang->productplan->unexpired = 'Unexpired Plans';
$lang->productplan->all = 'All Plans';
$lang->productplan->confirmDelete = "Do you want to delete this plan?";
$lang->productplan->confirmUnlinkStory = "Do you want to unlink this story?";
$lang->productplan->confirmUnlinkBug = "Do you want to unlink this bug?";
$lang->productplan->noPlan = 'No plans yet. ';
$lang->productplan->id = 'ID';
$lang->productplan->product = $lang->productCommon;
$lang->productplan->branch = 'Platform/Branch';
$lang->productplan->title = 'Title';
$lang->productplan->desc = 'Description';
$lang->productplan->begin = 'Begin';
$lang->productplan->end = 'End';
$lang->productplan->last = 'Last Plan';
$lang->productplan->future = 'TBD';
$lang->productplan->stories = 'Story';
$lang->productplan->bugs = 'Bug';
$lang->productplan->hour = 'Hours';
$lang->productplan->project = $lang->projectCommon;
$lang->productplan->parent = "Parent Plan";
$lang->productplan->children= "Child Plan";
$lang->productplan->endList[7] = '1 Week';
$lang->productplan->endList[14] = '2 Weeks';
$lang->productplan->endList[31] = '1 Month';
$lang->productplan->endList[62] = '2 Months';
$lang->productplan->endList[93] = '3 Months';
$lang->productplan->endList[186] = '6 Months';
$lang->productplan->endList[365] = '1 Year';
$lang->productplan->errorNoTitle = 'ID %s title should not be empty.';
$lang->productplan->errorNoBegin = 'ID %s begin time should not be empty.';
$lang->productplan->errorNoEnd = 'ID %s end time should not be empty.';
$lang->productplan->beginGeEnd = 'ID %s begin time should not be >= end time.';
$lang->productplan->featureBar['browse']['all'] = 'All';
$lang->productplan->featureBar['browse']['unexpired'] = 'Unexpired';
$lang->productplan->featureBar['browse']['overdue'] = 'Expired';
module/project/lang/en.php
+8 -8
View File
@@ -107,13 +107,13 @@ $lang->project->aclList['custom'] = 'Whitelist (Team members and the whitelist
/* 方法列表。*/
$lang->project->index = "Project Home";
$lang->project->task = 'Tasks';
$lang->project->task = 'Task List';
$lang->project->groupTask = 'Group View';
$lang->project->story = 'Story';
$lang->project->bug = 'Bug';
$lang->project->story = 'Story List';
$lang->project->bug = 'Bug List';
$lang->project->dynamic = 'Dynamics';
$lang->project->latestDynamic = 'Dynamics';
$lang->project->build = 'Build';
$lang->project->build = 'Build List';
$lang->project->testtask = 'Request';
$lang->project->burn = 'Burndown';
$lang->project->computeBurn = 'Update';
@@ -132,18 +132,18 @@ $lang->project->unlinkedProducts = 'Unlinked Products';
$lang->project->view = "Overview";
$lang->project->create = "Create {$lang->projectCommon}";
$lang->project->copy = "Copy {$lang->projectCommon}";
$lang->project->delete = "Delete";
$lang->project->browse = "Browse";
$lang->project->delete = "Delete {$lang->projectCommon}";
$lang->project->browse = "{$lang->projectCommon} List";
$lang->project->edit = "Edit Project";
$lang->project->batchEdit = "Batch Edit";
$lang->project->manageMembers = 'Manage Team';
$lang->project->unlinkMember = 'Remove Member';
$lang->project->unlinkStory = 'Unlink';
$lang->project->unlinkStory = 'Unlink Story';
$lang->project->batchUnlinkStory = 'Batch Unlink Stories';
$lang->project->importTask = 'Transfer Task';
$lang->project->importPlanStories = 'Link Stories By Plans';
$lang->project->importBug = 'Import Bug';
$lang->project->updateOrder = 'Rank';
$lang->project->updateOrder = "Rank {$lang->projectCommon}";
$lang->project->tree = 'Tree';
$lang->project->treeTask = 'Show Task Only';
$lang->project->treeStory = 'Show Story Only';
module/story/lang/en.php
+1 -1
View File
@@ -35,7 +35,7 @@ $lang->story->caseCount = 'Cases';
$lang->story->taskCountAB = 'T';
$lang->story->bugCountAB = 'B';
$lang->story->caseCountAB = 'C';
$lang->story->linkStory = 'Link';
$lang->story->linkStory = 'Link Story';
$lang->story->unlinkStory = 'UnLinked';
$lang->story->export = "Export";
$lang->story->zeroCase = "Story with 0 case";
module/testcase/lang/en.php
+2 -2
View File
@@ -94,8 +94,8 @@ $lang->testcase->delete = "Delete";
$lang->testcase->batchDelete = "Batch Delete ";
$lang->testcase->batchConfirmStoryChange = "Batch Confirm";
$lang->testcase->batchCaseTypeChange = "Batch Change Type";
$lang->testcase->browse = "Case";
$lang->testcase->groupCase = "By Group";
$lang->testcase->browse = "Case List";
$lang->testcase->groupCase = "View By Group";
$lang->testcase->import = "Import";
$lang->testcase->importFile = "Import CSV";
$lang->testcase->importFromLib = "Import From Library";
module/testtask/lang/en.php
+4 -4
View File
@@ -23,11 +23,11 @@ $lang->testtask->batchUnlinkCases = "Batch Unlink Case";
$lang->testtask->batchAssign = "Batch Assign";
$lang->testtask->runCase = "Run";
$lang->testtask->batchRun = "Batch Run";
$lang->testtask->results = "Result";
$lang->testtask->results = "Case Result";
$lang->testtask->createBug = "Bug(+)";
$lang->testtask->assign = 'Assign';
$lang->testtask->cases = 'Case';
$lang->testtask->groupCase = "By Group";
$lang->testtask->cases = 'Case List';
$lang->testtask->groupCase = "View By Group";
$lang->testtask->pre = 'Prev.';
$lang->testtask->next = 'Next';
$lang->testtask->start = "Start";
@@ -64,7 +64,7 @@ $lang->testtask->lastRunTime = 'Last Run';
$lang->testtask->lastRunResult = 'Result';
$lang->testtask->reportField = 'Report';
$lang->testtask->files = 'Upload';
$lang->testtask->case = 'Case';
$lang->testtask->case = 'Case List';
$lang->testtask->version = 'Version';
$lang->testtask->caseResult = 'Test Result';
$lang->testtask->stepResults = 'Step Result';
www/theme/default/style.css
+3
View File
@@ -26,3 +26,6 @@
/* Pager v-align. */
.pager>li>.pager-label { padding: 2px; line-height: 21px; }
.side .leftmenu .nav-primary>li.active>a { background-color: #e7f1fc;}
.side .leftmenu .nav-primary>li.active>a:hover {background-color: #006af1;}