From f0ed277adbb3e757c1682d9f0e18c6648f4e3c0a Mon Sep 17 00:00:00 2001
From: Guan Xiying <guanxiying@easycorp.ltd>
Date: Mon, 23 Aug 2021 14:15:55 +0800
Subject: [PATCH] * Fix browe mr page.

---
 module/mr/lang/zh-cn.php       | 11 +++++++++++
 module/mr/view/browse.html.php |  8 ++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index 8708c0be55..5258ef68b9 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -6,6 +6,8 @@ $lang->mr->list   = $lang->mr->browse;
 $lang->mr->edit   = "编辑{$lang->mr->common}";
 $lang->mr->delete = "删除{$lang->mr->common}";
 $lang->mr->view   = "详情";
+$lang->mr->source = '源项目分支';
+$lang->mr->target = '目标项目分支';
 
 $lang->mr->id       = 'ID';
 $lang->mr->iid      = "MR原始ID";
@@ -17,6 +19,15 @@ $lang->mr->reviewer = '评审人';
 $lang->mr->link     = 'GitLab链接';
 $lang->mr->canMerge = '是否可合并';
 
+$lang->mr->statusList = array();
+$lang->mr->statusList['opened'] = '开放中';
+$lang->mr->statusList['closed'] = '已关闭';
+$lang->mr->statusList['merged'] = '已合并';
+
+$lang->mr->canMergeStatusList = array();
+$lang->mr->canMergeStatusList['can_be_merged']    = '可合并';
+$lang->mr->canMergeStatusList['cannot_be_merged'] = '不可合并';
+
 $lang->mr->description   = '描述';
 $lang->mr->confirmDelete = '确认删除该merge request吗？';
 $lang->mr->sourceProject = '源项目';
diff --git a/module/mr/view/browse.html.php b/module/mr/view/browse.html.php
index b924bc50a9..63a2c33f3c 100644
--- a/module/mr/view/browse.html.php
+++ b/module/mr/view/browse.html.php
@@ -37,11 +37,11 @@
           <td class='text'><?php echo $mr->id; ?></td>
           <td class='text'><?php echo $mr->name; ?></td>
           <td class='text'><?php echo $this->loadModel('gitlab')->apiGetSingleProject($mr->gitlabID, $mr->sourceProject)->name_with_namespace; ?></td>
-          <td class='text'><?php echo $mr->sourceBranch; ?></td>
+          <td class='text'><?php echo $mr->sourceBranch;?></td>
           <td class='text'><?php echo $this->loadModel('gitlab')->apiGetSingleProject($mr->gitlabID, $mr->targetProject)->name_with_namespace; ?></td>
-          <td class='text'><?php echo $mr->targetBranch; ?></td>
-          <td class='text'><?php echo $mr->status; ?></td>
-          <td class='text'><?php echo $mr->canMerge; ?></td>
+          <td class='text'><?php echo $mr->targetBranch;?></td>
+          <td class='text'><?php echo zget($lang->mr->statusList, $mr->status);?></td>
+          <td class='text'><?php echo zget($lang->mr->canMergeStatusList, $mr->canMerge);?></td>
           <td class='text-left c-actions'>
             <?php
             common::printLink('mr', 'list', "mr={$mr->id}", '<i class="icon icon-review"></i>', '', "title='{$lang->mr->list}' class='btn btn-info'");