From c94315115711ffd7ca40b6cfe1ec8c5c2b4e2f6b Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Thu, 2 Dec 2021 14:28:50 +0800
Subject: [PATCH]  * Fix bug #16847.

---
 module/group/lang/resource.php | 2 +-
 module/mr/control.php          | 2 +-
 module/mr/lang/en.php          | 1 -
 module/mr/lang/zh-cn.php       | 1 -
 module/mr/lang/zh-tw.php       | 1 -
 module/mr/view/browse.html.php | 2 +-
 6 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 0dcf165106..e34a8e0ef1 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -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';
diff --git a/module/mr/control.php b/module/mr/control.php
index e6dd5b26bb..136e4c4a63 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -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;
diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php
index 224a750b11..67839e182e 100644
--- a/module/mr/lang/en.php
+++ b/module/mr/lang/en.php
@@ -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';
diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index c5b77246d7..81e85c2687 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -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       = '目标项目分支';
diff --git a/module/mr/lang/zh-tw.php b/module/mr/lang/zh-tw.php
index 3dd556094d..e0b4a07446 100644
--- a/module/mr/lang/zh-tw.php
+++ b/module/mr/lang/zh-tw.php
@@ -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       = '目標項目分支';
diff --git a/module/mr/view/browse.html.php b/module/mr/view/browse.html.php
index 1ff9c204a8..557bbe03d7 100644
--- a/module/mr/view/browse.html.php
+++ b/module/mr/view/browse.html.php
@@ -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' : ''));