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

* Fix bug #16847.

Browse Source
This commit is contained in:
liyuchun
2021-12-02 14:28:50 +08:00
parent 2899947808
commit c943151157
6 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/lang/resource.php
+1 -1
View File
@@ -1281,7 +1281,7 @@ $lang->resource->mr->create = 'create';
$lang->resource->mr->browse = 'browse';
$lang->resource->mr->edit = 'edit';
$lang->resource->mr->delete = 'delete';
$lang->resource->mr->view = 'view';
$lang->resource->mr->view = 'overview';
$lang->resource->mr->accept = 'accept';
$lang->resource->mr->diff = 'viewDiff';
$lang->resource->mr->link = 'linkList';
module/mr/control.php
+1 -1
View File
@@ -208,7 +208,7 @@ class mr extends control
$this->view->compile = $this->loadModel('compile')->getById($MR->compileID);
$this->view->compileJob = $MR->jobID ? $this->loadModel('job')->getById($MR->jobID) : false;
$this->view->title = $this->lang->mr->view;
$this->view->title = $this->lang->mr->overview;
$this->view->MR = $MR;
$this->view->rawMR = isset($rawMR) ? $rawMR : false;
$this->view->product = $product;
module/mr/lang/en.php
-1
View File
@@ -7,7 +7,6 @@ $lang->mr->browse = "Browse";
$lang->mr->list = "List";
$lang->mr->edit = "Edit";
$lang->mr->delete = "Delete";
$lang->mr->view = "View";
$lang->mr->accept = "Accept";
$lang->mr->source = 'source';
$lang->mr->target = 'target';
module/mr/lang/zh-cn.php
-1
View File
@@ -7,7 +7,6 @@ $lang->mr->browse = "浏览{$lang->mr->common}";
$lang->mr->list = $lang->mr->browse;
$lang->mr->edit = "编辑{$lang->mr->common}";
$lang->mr->delete = "删除{$lang->mr->common}";
$lang->mr->view = "{$lang->mr->common}详情";
$lang->mr->accept = "合并请求";
$lang->mr->source = '源项目分支';
$lang->mr->target = '目标项目分支';
module/mr/lang/zh-tw.php
-1
View File
@@ -6,7 +6,6 @@ $lang->mr->browse = "瀏覽{$lang->mr->common}";
$lang->mr->list = $lang->mr->browse;
$lang->mr->edit = "編輯{$lang->mr->common}";
$lang->mr->delete = "刪除{$lang->mr->common}";
$lang->mr->view = "{$lang->mr->common}詳情";
$lang->mr->accept = "合併請求";
$lang->mr->source = '源項目分支';
$lang->mr->target = '目標項目分支';
module/mr/view/browse.html.php
+1 -1
View File
@@ -82,7 +82,7 @@
<?php endif;?>
<td class='c-actions'>
<?php
common::printLink('mr', 'view', "mr={$MR->id}", '<i class="icon icon-eye"></i>', '', "title='{$lang->mr->view}' class='btn btn-info'");
common::printLink('mr', 'view', "mr={$MR->id}", '<i class="icon icon-eye"></i>', '', "title='{$lang->mr->overview}' class='btn btn-info'");
common::printLink('mr', 'edit', "mr={$MR->id}", '<i class="icon icon-edit"></i>', '', "title='{$lang->mr->edit}' class='btn btn-info'");
common::printLink('mr', 'diff', "mr={$MR->id}", '<i class="icon icon-review"></i>', '', "title='{$lang->mr->viewDiff}' class='btn btn-info'");
common::printLink('mr', 'link', "mr={$MR->id}", '<i class="icon icon-link"></i>', '', "title='{$lang->mr->link}' class='btn btn-info'" . ($MR->linkButton == false ? 'disabled' : ''));