From f578ad80e75d7e8fc3f385dede3b7bb480360fb6 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 11 Jul 2019 15:07:14 +0800
Subject: [PATCH]  * finish task #5992.

---
 module/bug/lang/zh-cn.php            |  2 +-
 module/custom/view/required.html.php | 13 +++++++++++--
 module/dept/lang/en.php              |  2 +-
 module/doc/lang/en.php               |  2 +-
 module/product/lang/en.php           |  2 +-
 module/testcase/lang/zh-cn.php       |  2 +-
 module/testsuite/lang/zh-cn.php      |  2 +-
 7 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 5ca5b362f8..9b3aeda33c 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -80,7 +80,7 @@ $lang->bug->batchCreate        = '批量提Bug';
 $lang->bug->confirmBug         = '确认';
 $lang->bug->confirmAction      = '确认Bug';
 $lang->bug->batchConfirm       = '批量确认';
-$lang->bug->edit               = '编辑';
+$lang->bug->edit               = '编辑Bug';
 $lang->bug->batchEdit          = '批量编辑';
 $lang->bug->batchChangeModule  = '批量修改模块';
 $lang->bug->batchChangeBranch  = '批量修改分支';
diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php
index e8467469bc..04e540e3a8 100644
--- a/module/custom/view/required.html.php
+++ b/module/custom/view/required.html.php
@@ -50,7 +50,15 @@
               $fields = $this->custom->getFormFields('testcase', $method);
               $method = 'createCase';
           }
-          echo $lang->$moduleName->$method . $lang->custom->page;
+          $actionKey = $method . 'Action';
+          if(isset($lang->$moduleName->$actionKey))
+          {
+              echo $lang->$moduleName->$actionKey . $lang->custom->page;
+          }
+          else
+          {
+              echo $lang->$moduleName->$method . $lang->custom->page;
+          }
           ?>
           </th>
           <td><?php echo html::select("requiredFields[{$method}][]", $fields, $requiredField, "class='form-control chosen' multiple " . ($i == 0 ? "data-placeholder='{$lang->custom->notice->required}'" : ''));?></td>
@@ -59,7 +67,8 @@
         <?php $i++;?>
         <?php endforeach;?>
         <tr>
-          <td colspan='3' class='text-center form-actions'>
+          <th></th>
+          <td colspan='2' class='form-actions'>
           <?php echo html::submitButton();?>
           <?php if(common::hasPriv('custom', 'resetRequired')) echo html::a(inlink('resetRequired', "module=$moduleName"), $lang->custom->restore, 'hiddenwin', "class='btn btn-wide'");?>
           </td>
diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php
index 902528e1c4..03b34cf581 100644
--- a/module/dept/lang/en.php
+++ b/module/dept/lang/en.php
@@ -18,7 +18,7 @@ $lang->dept->manager     = "Manager";
 $lang->dept->name        = "Department Name";
 $lang->dept->browse      = "Manage Department";
 $lang->dept->manage      = "Manage Department";
-$lang->dept->updateOrder = "Order Department";
+$lang->dept->updateOrder = "Rank Department";
 $lang->dept->add         = "Add Department";
 $lang->dept->dragAndSort = "Drag to order";
 
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index dae97b332e..0db037ee40 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -72,7 +72,7 @@ $lang->doc->browse           = 'Document List';
 $lang->doc->view             = 'Document Detail';
 $lang->doc->diff             = 'Diff';
 $lang->doc->diffAction       = 'Diff Document';
-$lang->doc->sort             = 'Order Document';
+$lang->doc->sort             = 'Rank Document';
 $lang->doc->manageType       = 'Manage Category';
 $lang->doc->editType         = 'Edit';
 $lang->doc->deleteType       = 'Delete';
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 3c09ebe31a..ba7ce06377 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -26,7 +26,7 @@ $lang->product->mine         = 'My:';
 $lang->product->other        = 'Others:';
 $lang->product->closed       = 'Closed';
 $lang->product->updateOrder  = 'Order';
-$lang->product->orderAction  = "Order {$lang->productCommon}";
+$lang->product->orderAction  = "Rank {$lang->productCommon}";
 $lang->product->all          = "All {$lang->productCommon}s";
 $lang->product->export       = 'Export';
 $lang->product->exportAction = "Export {$lang->productCommon}";
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index ff6279f8c3..104d829c7f 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -85,7 +85,7 @@ $lang->testcase->view                    = "用例详情";
 $lang->testcase->review                  = "评审";
 $lang->testcase->reviewAB                = "评审";
 $lang->testcase->batchReview             = "批量评审";
-$lang->testcase->edit                    = "编辑";
+$lang->testcase->edit                    = "编辑用例";
 $lang->testcase->batchEdit               = "批量编辑 ";
 $lang->testcase->batchChangeModule       = "批量修改模块";
 $lang->testcase->confirmLibcaseChange    = "同步用例库用例修改";
diff --git a/module/testsuite/lang/zh-cn.php b/module/testsuite/lang/zh-cn.php
index b5947934e7..455cb228b3 100644
--- a/module/testsuite/lang/zh-cn.php
+++ b/module/testsuite/lang/zh-cn.php
@@ -13,7 +13,7 @@ $lang->testsuite->index            = "套件首页";
 $lang->testsuite->create           = "建套件";
 $lang->testsuite->delete           = "删除";
 $lang->testsuite->view             = "概况";
-$lang->testsuite->edit             = "编辑";
+$lang->testsuite->edit             = "编辑套件";
 $lang->testsuite->browse           = "套件列表";
 $lang->testsuite->linkCase         = "关联用例";
 $lang->testsuite->linkVersion      = "版本";