From c2e05057f585fbc6058abf520ab7269442b6fbd1 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 9 Nov 2017 15:11:08 +0800
Subject: [PATCH]  * finish task #3341.

---
 module/common/lang/en.php            | 4 ++--
 module/common/lang/zh-cn.php         | 4 ++--
 module/custom/model.php              | 2 +-
 module/custom/view/required.html.php | 4 ++--
 module/product/lang/en.php           | 2 +-
 module/product/lang/zh-cn.php        | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 5eeab17c66..09649889f1 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -601,7 +601,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyStory')
     unset($lang->product->menu->doc);
     
     /* Rename product module. */
-    $lang->menu->product = 'Product|product|index';
+    $lang->menu->product = "{$lang->productCommon}|product|index";
 
     /* Adjust search items. */
     unset($lang->searchObjects['bug']);
@@ -665,7 +665,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
     unset($lang->menuOrder[30]);
 
     /* Rename product module. */
-    $lang->menu->product = 'Product|product|index';
+    $lang->menu->product = "{$lang->productCommon}|product|index";
 
     /* Adjust sub menu of my dashboard. */
     unset($lang->my->menu->task);
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 0ad5af85b3..4955433c18 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -601,7 +601,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyStory')
     unset($lang->product->menu->doc);
     
     /* Rename product module. */
-    $lang->menu->product = '产品|product|index';
+    $lang->menu->product = "{$lang->productCommon}|product|index";
 
     /* Adjust search items. */
     unset($lang->searchObjects['bug']);
@@ -665,7 +665,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
     unset($lang->menuOrder[30]);
 
     /* Rename product module. */
-    $lang->menu->product = '产品|product|index';
+    $lang->menu->product = "{$lang->productCommon}|product|index";
 
     /* Adjust sub menu of my dashboard. */
     unset($lang->my->menu->task);
diff --git a/module/custom/model.php b/module/custom/model.php
index 51ee02eca4..53eb15e080 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -402,7 +402,7 @@ class customModel extends model
      * @access public
      * @return array
      */
-    public function getDBFields($moduleName, $method = '')
+    public function getFormFields($moduleName, $method = '')
     {
         $fields       = array();
         $moduleLang   = $this->lang->$moduleName;
diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php
index 247ce43aaf..3ed7744556 100644
--- a/module/custom/view/required.html.php
+++ b/module/custom/view/required.html.php
@@ -33,13 +33,13 @@
         <tr>
           <th class='w-100px'>
           <?php
-          $fields = $this->custom->getDBFields($moduleName, $method);
+          $fields = $this->custom->getFormFields($moduleName, $method);
 
           if($moduleName == 'testsuite' and $method == 'createlib')  $method = 'createLib';
           if($moduleName == 'testsuite' and $method == 'createcase')
           {
               $this->app->loadLang('testcase');
-              $fields = $this->custom->getDBFields('testcase', $method);
+              $fields = $this->custom->getFormFields('testcase', $method);
               $method = 'createCase';
           }
           echo $lang->$moduleName->$method;
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 7dde6aec3d..e64fa54319 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -11,7 +11,7 @@
  */
 $lang->product->common      = $lang->productCommon . 'View';
 $lang->product->index       = $lang->productCommon . "Home";
-$lang->product->browse      = "{$lang->productCommon}s";
+$lang->product->browse      = "Story List";
 $lang->product->dynamic     = "Dynamic";
 $lang->product->view        = "{$lang->productCommon}s";
 $lang->product->edit        = "Edit {$lang->productCommon}";
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index 7c5caaa86f..e60bf4f4be 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -11,7 +11,7 @@
  */
 $lang->product->common      = $lang->productCommon . '视图';
 $lang->product->index       = $lang->productCommon . "首页";
-$lang->product->browse      = "浏览{$lang->productCommon}";
+$lang->product->browse      = "需求列表";
 $lang->product->dynamic     = "动态";
 $lang->product->view        = "{$lang->productCommon}概况";
 $lang->product->edit        = "编辑{$lang->productCommon}";