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

* Adjust all executions lanague.

Browse Source
This commit is contained in:
holan20180123
2021-03-09 15:15:28 +08:00
parent 28f54ef4c3
commit 032b89aaed
17 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+6 -6
View File
@@ -667,7 +667,7 @@ class actionModel extends model
$condition = "(product =',0,' AND project = '0')";
if($projectCondition) $condition .= ' OR ' . $projectCondition;
if($productCondition) $condition .= ' OR ' . $productCondition;
if($this->app->user->admin) $condition = 1;
if($this->app->user->admin) $condition = 1;
}
/* If is project, select its related. */
@@ -763,9 +763,9 @@ class actionModel extends model
}
if($this->session->actionQuery == false) $this->session->set('actionQuery', ' 1 = 1');
$allProduct = "`product` = 'all'";
$allExecution = "`execution` = 'all'";
$actionQuery = $this->session->actionQuery;
$allProduct = "`product` = 'all'";
$allExecutions = "`execution` = 'all'";
$actionQuery = $this->session->actionQuery;
$productID = 0;
if(preg_match("/`product` = '(\d*)'/", $actionQuery, $out))
@@ -783,13 +783,13 @@ class actionModel extends model
}
/* If the sql not include 'execution', add check purview for execution. */
if(strpos($actionQuery, $allExecution) === false)
if(strpos($actionQuery, $allExecutions) === false)
{
$actionQuery = $actionQuery . ' AND `execution`' . helper::dbIN(array_keys($executions));
}
else
{
$actionQuery = str_replace($allExecution, '1', $actionQuery);
$actionQuery = str_replace($allExecutions, '1', $actionQuery);
}
$actionQuery = str_replace("`product` = '$productID'", "`product` LIKE '%,$productID,%'", $actionQuery);
module/block/lang/de.php
+4 -4
View File
@@ -59,9 +59,9 @@ $lang->block->resolvedRisks = 'Risks Resolved';
$lang->block->createdIssues = 'Issues Created';
$lang->block->resolvedIssues = 'Issues Resolved';
$lang->block->createdDocs = 'Docs Created';
$lang->block->allProject = 'All ' . $lang->executionCommon;
$lang->block->doingProject = 'Doning ' . $lang->executionCommon;
$lang->block->finishProject = 'Finish ' . $lang->executionCommon;
$lang->block->allExecutions = 'All ' . $lang->executionCommon;
$lang->block->doingExecution = 'Doning ' . $lang->executionCommon;
$lang->block->finishExecution = 'Finish ' . $lang->executionCommon;
$lang->block->estimatedHours = 'Estimated Hours';
$lang->block->consumedHours = 'Consumed Hours';
$lang->block->time = 'No';
@@ -83,7 +83,7 @@ $lang->block->closeForever = 'Dauerhaft schließen';
$lang->block->confirmClose = 'Möchten Sie den Block dauerhaft schlißen? Nach der Ausführung ist der Block nicht mehr verfügbar. Er kann unter Admin->Custom aber wieder aktiviert werden.';
$lang->block->remove = 'Entfernen';
$lang->block->refresh = 'Aktualisieren';
$lang->block->nbsp = '';
$lang->block->nbsp = '';
$lang->block->hidden = 'Verstecken';
$lang->block->dynamicInfo = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <em>%s</em> %s <a href='%s'>%s</a></span>";
module/block/lang/en.php
+4 -4
View File
@@ -59,9 +59,9 @@ $lang->block->resolvedRisks = 'Risks Resolved';
$lang->block->createdIssues = 'Issues Created';
$lang->block->resolvedIssues = 'Issues Resolved';
$lang->block->createdDocs = 'Docs Created';
$lang->block->allProject = 'All ' . $lang->executionCommon;
$lang->block->doingProject = 'Doning ' . $lang->executionCommon;
$lang->block->finishProject = 'Finish ' . $lang->executionCommon;
$lang->block->allExecutions = 'All ' . $lang->executionCommon;
$lang->block->doingExecution = 'Doning ' . $lang->executionCommon;
$lang->block->finishExecution = 'Finish ' . $lang->executionCommon;
$lang->block->estimatedHours = 'Estimated Hours';
$lang->block->consumedHours = 'Consumed Hours';
$lang->block->time = 'No';
@@ -472,7 +472,7 @@ $lang->block->typeList->story['assignedTo'] = 'AssignedToMe';
$lang->block->typeList->story['openedBy'] = 'CreatedByMe';
$lang->block->typeList->story['reviewedBy'] = 'ReviewedByMe';
$lang->block->typeList->story['closedBy'] = 'ClosedByMe' ;
$lang->block->typeList->product['noclosed'] = 'Open';
$lang->block->typeList->product['closed'] = 'Closed';
$lang->block->typeList->product['all'] = 'All';
module/block/lang/fr.php
+4 -4
View File
@@ -59,9 +59,9 @@ $lang->block->resolvedRisks = 'Risks Resolved';
$lang->block->createdIssues = 'Issues Created';
$lang->block->resolvedIssues = 'Issues Resolved';
$lang->block->createdDocs = 'Docs Created';
$lang->block->allProject = 'All ' . $lang->executionCommon;
$lang->block->doingProject = 'Doning ' . $lang->executionCommon;
$lang->block->finishProject = 'Finish ' . $lang->executionCommon;
$lang->block->allExecutions = 'All ' . $lang->executionCommon;
$lang->block->doingExecution = 'Doning ' . $lang->executionCommon;
$lang->block->finishExecution = 'Finish ' . $lang->executionCommon;
$lang->block->estimatedHours = 'Estimated Hours';
$lang->block->consumedHours = 'Consumed Hours';
$lang->block->time = 'No';
@@ -472,7 +472,7 @@ $lang->block->typeList->story['assignedTo'] = 'Stories qui me sont assignées';
$lang->block->typeList->story['openedBy'] = "Stories que j'ai créées";
$lang->block->typeList->story['reviewedBy'] = "Stories que j'ai acceptées";
$lang->block->typeList->story['closedBy'] = "Stories que j'ai fermées";
$lang->block->typeList->product['noclosed'] = 'Ouverts';
$lang->block->typeList->product['closed'] = 'Fermés';
$lang->block->typeList->product['all'] = 'Tous';
module/block/lang/vi.php
+5 -5
View File
@@ -54,14 +54,14 @@ $lang->block->finishedTasks = 'Tasks Finished';
$lang->block->createdBugs = 'Bugs Created';
$lang->block->resolvedBugs = 'Bugs Resolved';
$lang->block->createdCases = 'Cases Created';
$lang->block->createdRisks = 'Risks Created';
$lang->block->createdRisks = 'Risks Created';
$lang->block->resolvedRisks = 'Risks Resolved';
$lang->block->createdIssues = 'Issues Created';
$lang->block->resolvedIssues = 'Issues Resolved';
$lang->block->createdDocs = 'Docs Created';
$lang->block->allProject = 'All ' . $lang->executionCommon;
$lang->block->doingProject = 'Doning ' . $lang->executionCommon;
$lang->block->finishProject = 'Finish ' . $lang->executionCommon;
$lang->block->allExecutions = 'All ' . $lang->executionCommon;
$lang->block->doingExecution = 'Doning ' . $lang->executionCommon;
$lang->block->finishExecution = 'Finish ' . $lang->executionCommon;
$lang->block->estimatedHours = 'Estimated Hours';
$lang->block->consumedHours = 'Consumed Hours';
$lang->block->time = 'No';
@@ -472,7 +472,7 @@ $lang->block->typeList->story['assignedTo'] = 'Giao cho bạn';
$lang->block->typeList->story['openedBy'] = 'Tạo bởi bạn';
$lang->block->typeList->story['reviewedBy'] = 'Duyệt bởi bạn';
$lang->block->typeList->story['closedBy'] = 'ClosedByMe' ;
$lang->block->typeList->product['noclosed'] = 'Mở';
$lang->block->typeList->product['closed'] = 'Đã đóng';
$lang->block->typeList->product['all'] = 'Tất cả';
module/block/lang/zh-cn.php
+1 -1
View File
@@ -59,7 +59,7 @@ $lang->block->resolvedRisks = '解决的风险数';
$lang->block->createdIssues = '创建的问题数';
$lang->block->resolvedIssues = '解决的问题数';
$lang->block->createdDocs = '创建的文档数';
$lang->block->allExecution = '所有' . $lang->executionCommon;
$lang->block->allExecutions = '所有' . $lang->executionCommon;
$lang->block->doingExecution = '进行中的' . $lang->executionCommon;
$lang->block->finishExecution = '累积' . $lang->executionCommon;
$lang->block->estimatedHours = '预计';
module/block/view/sprintblock.html.php
+1 -1
View File
@@ -19,7 +19,7 @@
<div class="panel-body table-row">
<div class="col-4 text-middle text-center">
<div class="tile">
<div class="tile-title"><?php echo $lang->block->allExecution;?></div>
<div class="tile-title"><?php echo $lang->block->allExecutions;?></div>
<?php $projectLink = $this->createLink('project', 'all', 'status=all')?>
<div class="tile-amount"><?php echo $summary->total ? html::a($projectLink, $summary->total) : 0;?></div>
</div>
module/doc/lang/de.php
+2 -2
View File
@@ -96,8 +96,8 @@ $lang->doc->removeMenu = 'Vom Menü entfernen';
$lang->doc->search = 'Suche';
/* 查询条件列表 */
$lang->doc->allProduct = 'Alle' . $lang->productCommon;
$lang->doc->allProject = 'Alle' . $lang->executionCommon;
$lang->doc->allProduct = 'Alle' . $lang->productCommon;
$lang->doc->allExecutions = 'Alle' . $lang->executionCommon;
$lang->doc->libTypeList['product'] = $lang->productCommon . ' Bibliothek';
$lang->doc->libTypeList['execution'] = $lang->executionCommon . ' Bibliothek';
module/doc/lang/en.php
+2 -2
View File
@@ -96,8 +96,8 @@ $lang->doc->removeMenu = 'Remove from Menu';
$lang->doc->search = 'Search';
/* Query condition list. */
$lang->doc->allProduct = 'All' . $lang->productCommon . 's';
$lang->doc->allProject = 'All' . $lang->executionCommon . 's';
$lang->doc->allProduct = 'All' . $lang->productCommon . 's';
$lang->doc->allExecutions = 'All' . $lang->executionCommon . 's';
$lang->doc->libTypeList['product'] = $lang->productCommon . ' Library';
$lang->doc->libTypeList['execution'] = $lang->executionCommon . ' Library';
module/doc/lang/fr.php
+2 -2
View File
@@ -96,8 +96,8 @@ $lang->doc->removeMenu = 'Décoller du Menu';
$lang->doc->search = 'Rechercher';
/* 查询条件列表 */
$lang->doc->allProduct = 'Tous les ' . $lang->productCommon . 's';
$lang->doc->allProject = 'Tous les ' . $lang->executionCommon . 's';
$lang->doc->allProduct = 'Tous les' . $lang->productCommon . 's';
$lang->doc->allExecutions = 'Tous les' . $lang->executionCommon . 's';
$lang->doc->libTypeList['product'] = $lang->productCommon . ' Library';
$lang->doc->libTypeList['execution'] = 'Bibliothèque ' . $lang->executionCommon;
module/doc/lang/vi.php
+2 -2
View File
@@ -96,8 +96,8 @@ $lang->doc->removeMenu = 'Remove from Menu';
$lang->doc->search = 'Tìm kiếm';
/* Query condition list. */
$lang->doc->allProduct = 'All' . $lang->productCommon;
$lang->doc->allProject = 'All' . $lang->executionCommon;
$lang->doc->allProduct = 'All' . $lang->productCommon;
$lang->doc->allExecutions = 'All' . $lang->executionCommon;
$lang->doc->libTypeList['product'] = $lang->productCommon . ' thư viện';
$lang->doc->libTypeList['execution'] = $lang->executionCommon . ' thư viện';
module/doc/lang/zh-cn.php
+2 -2
View File
@@ -96,8 +96,8 @@ $lang->doc->removeMenu = '从菜单栏移除';
$lang->doc->search = '搜索';
/* 查询条件列表 */
$lang->doc->allProduct = '所有' . $lang->productCommon;
$lang->doc->allExecution = '所有' . $lang->executionCommon;
$lang->doc->allProduct = '所有' . $lang->productCommon;
$lang->doc->allExecutions = '所有' . $lang->executionCommon;
$lang->doc->libTypeList['product'] = $lang->productCommon . '文档库';
$lang->doc->libTypeList['execution'] = $lang->executionCommon . '文档库';
module/doc/model.php
+1 -1
View File
@@ -780,7 +780,7 @@ class docModel extends model
$this->config->doc->search['actionURL'] = $actionURL;
$this->config->doc->search['queryID'] = $queryID;
$this->config->doc->search['params']['product']['values'] = array(''=>'') + $this->loadModel('product')->getPairs('nocode', $this->session->project) + array('all'=>$this->lang->doc->allProduct);
$this->config->doc->search['params']['execution']['values'] = array(''=>'') + $this->loadModel('execution')->getPairs($this->session->project, 'all', 'noclosed') + array('all'=>$this->lang->doc->allExecution);
$this->config->doc->search['params']['execution']['values'] = array(''=>'') + $this->loadModel('execution')->getPairs($this->session->project, 'all', 'noclosed') + array('all'=>$this->lang->doc->allExecutions);
$this->config->doc->search['params']['lib']['values'] = array(''=>'', $libID => ($libID ? $libs[$libID] : 0), 'all' => $this->lang->doclib->all);
/* Get the modules. */
module/execution/control.php
+14 -14
View File
@@ -2407,14 +2407,14 @@ class execution extends control
$this->view->accountPairs = $this->loadModel('user')->getPairs('noletter|nodeleted');
/* Assign. */
$this->view->executionID = $executionID;
$this->view->type = $type;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->account = $account;
$this->view->param = $param;
$this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $type);
$this->view->direction = $direction;
$this->view->executionID = $executionID;
$this->view->type = $type;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->account = $account;
$this->view->param = $param;
$this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $type);
$this->view->direction = $direction;
$this->display();
}
@@ -2498,14 +2498,14 @@ class execution extends control
*/
public function ajaxGetRecentExecutions()
{
$allExecution = $this->execution->getRecentExecutions();
if(!empty($allExecution))
$allExecutions = $this->execution->getRecentExecutions();
if(!empty($allExecutions))
{
foreach($allExecution as $type => $executionList)
foreach($allExecutions as $type => $executionList)
{
echo '<div class="heading">'. $this->lang->execution->$type . '</div>';
$color = $type == 'recent' ? 'text-brown' : '';
$executions = $allExecution[$type];
$executions = $allExecutions[$type];
$executionsName = array();
foreach($executions as $execution) $executionsName[] = $execution->name;
$executionsPinYin = common::convert2Pinyin($executionsName);
@@ -2602,8 +2602,8 @@ class execution extends control
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
$this->view->title = $this->lang->execution->allExecution;
$this->view->position[] = $this->lang->execution->allExecution;
$this->view->title = $this->lang->execution->allExecutions;
$this->view->position[] = $this->lang->execution->allExecutions;
$this->view->executionStats = $this->project->getStats($this->session->project, $status, $productID, 0, 30, $orderBy, $pager);
$this->view->products = array(0 => $this->lang->product->select) + $this->loadModel('product')->getProductPairsByProject($this->session->project);
module/execution/lang/zh-cn.php
+1 -1
View File
@@ -12,7 +12,7 @@
/* 字段列表。*/
$lang->executionCommon = $lang->executionCommon;
$lang->execution->common = $lang->executionCommon . '视图';
$lang->execution->allExecution = '所有' . $lang->executionCommon;
$lang->execution->allExecutions = '所有' . $lang->executionCommon;
$lang->execution->id = $lang->executionCommon . '编号';
$lang->execution->type = $lang->executionCommon . '类型';
$lang->execution->name = $lang->executionCommon . '名称';
module/execution/model.php
+6 -6
View File
@@ -2846,7 +2846,7 @@ class executionModel extends model
{
$this->config->execution->search['actionURL'] = $actionURL;
$this->config->execution->search['queryID'] = $queryID;
$this->config->execution->search['params']['execution']['values'] = array(''=>'', $executionID => $executions[$executionID], 'all' => $this->lang->execution->allExecution);
$this->config->execution->search['params']['execution']['values'] = array(''=>'', $executionID => $executions[$executionID], 'all' => $this->lang->execution->allExecutions);
$showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : '';
$this->config->execution->search['params']['module']['values'] = $this->loadModel('tree')->getTaskOptionMenu($executionID, 0, 0, $showAllModule ? 'allModule' : '');
@@ -3462,7 +3462,7 @@ class executionModel extends model
$productPairs = $this->getStageLinkProductPairs($stageIdList);
$recentExecutions = isset($this->config->execution->recentExecutions) ? explode(',', $this->config->execution->recentExecutions) : array();
$allExecution = array('recent' => array(), 'mine' => array());
$allExecutions = array('recent' => array(), 'mine' => array());
foreach($executions as $execution)
{
if($execution->type == 'stage') $execution->name = zget($executionPairs, $execution->execution) . '/' . zget($productPairs, $execution->id) . '/' . $execution->name;
@@ -3470,14 +3470,14 @@ class executionModel extends model
if(in_array($execution->id, $recentExecutions))
{
$index = array_search($execution->id, $recentExecutions);
$allExecution['recent'][$index] = $execution;
$allExecutions['recent'][$index] = $execution;
continue;
}
$allExecution['mine'][] = $execution;
$allExecutions['mine'][] = $execution;
}
ksort($allExecution['recent']);
return $allExecution;
ksort($allExecutions['recent']);
return $allExecutions;
}
/**
module/group/lang/resource.php
+1 -1
View File
@@ -564,7 +564,7 @@ $lang->resource->execution->printKanban = 'printKanbanAction';
$lang->resource->execution->tree = 'treeAction';
$lang->resource->execution->treeTask = 'treeOnlyTask';
$lang->resource->execution->treeStory = 'treeOnlyStory';
$lang->resource->execution->all = 'allProjects';
$lang->resource->execution->all = 'allExecutions';
$lang->resource->execution->kanbanHideCols = 'kanbanHideCols';
$lang->resource->execution->kanbanColsColor = 'kanbanColsColor';
$lang->resource->execution->export = 'exportAction';