From 10da3ef8026338bbc9d3781052f89559a346ef93 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Feb 2023 09:32:56 +0800
Subject: [PATCH] * Modify language defined.

---
 module/block/view/reviewblock.html.php |  2 +-
 module/my/control.php                  |  2 +-
 module/my/lang/de.php                  | 17 +++--------------
 module/my/lang/en.php                  | 17 +++--------------
 module/my/lang/fr.php                  | 17 +++--------------
 module/my/lang/zh-cn.php               | 17 +++--------------
 module/my/model.php                    |  2 +-
 module/my/view/audit.html.php          |  2 +-
 8 files changed, 16 insertions(+), 60 deletions(-)

diff --git a/module/block/view/reviewblock.html.php b/module/block/view/reviewblock.html.php
index 99d7e0859d..7ea1d6454b 100644
--- a/module/block/view/reviewblock.html.php
+++ b/module/block/view/reviewblock.html.php
@@ -33,7 +33,7 @@
 
       $typeName = '';
       if(isset($lang->{$review->type}->common)) $typeName = $lang->{$review->type}->common;
-      if($type == 'story') $typeName = $lang->my->auditMenu->audit->story;
+      if($type == 'story') $typeName = $lang->my->featureBar['audit']['story'];
       if($review->type == 'projectreview') $typeName = $lang->project->common;
       if(isset($flows[$review->type])) $typeName = $flows[$review->type];
 
diff --git a/module/my/control.php b/module/my/control.php
index d683f1f131..0ea2358b25 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -968,7 +968,7 @@ EOF;
             $typeList = $this->my->getReviewingTypeList();
             if(!isset($typeList->$browseType)) $browseType = 'all';
 
-            $this->lang->my->auditMenu->audit = $typeList;
+            $this->lang->my->featureBar['audit'] = (array)$typeList;
             $reviewList = $this->my->getReviewingList($browseType, $orderBy, $pager);
         }
 
diff --git a/module/my/lang/de.php b/module/my/lang/de.php
index 70defe1a7a..a75646bc7d 100644
--- a/module/my/lang/de.php
+++ b/module/my/lang/de.php
@@ -94,20 +94,6 @@ $lang->my->auditField->oaTitle['makeup']   = '%s application for makeup:%s';
 $lang->my->auditField->oaTitle['overtime'] = '%s application for overtime: %s';
 $lang->my->auditField->oaTitle['lieu']     = '%s application for lieu: %s';
 
-$lang->my->auditMenu = new stdclass();
-$lang->my->auditMenu->audit = new stdclass();
-$lang->my->auditMenu->audit->all      = 'All';
-$lang->my->auditMenu->audit->story    = 'Story';
-$lang->my->auditMenu->audit->testcase = 'Case';
-if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->auditMenu->audit->project = $lang->projectCommon;
-if($config->edition != 'open') $lang->my->auditMenu->audit->feedback = 'Feedback';
-if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->auditMenu->audit->oa = 'OA';
-
-$lang->my->contributeMenu = new stdclass();
-$lang->my->contributeMenu->audit = new stdclass();
-$lang->my->contributeMenu->audit->reviewedbyme = 'ReviewedByMe';
-$lang->my->contributeMenu->audit->createdbyme  = 'CreatedByMe';
-
 $lang->my->projectMenu = new stdclass();
 $lang->my->projectMenu->doing      = 'Doing';
 $lang->my->projectMenu->wait       = 'Waiting';
@@ -169,6 +155,9 @@ $lang->my->featureBar['todo']['cycle']           = 'Recurrence';
 $lang->my->featureBar['audit']['all']      = 'All';
 $lang->my->featureBar['audit']['story']    = 'Story';
 $lang->my->featureBar['audit']['testcase'] = 'Test case';
+if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->featureBar['audit']['project'] = $lang->projectCommon;
+if($config->edition != 'open') $lang->my->featureBar['audit']['feedback'] = 'Feedback';
+if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->featureBar['audit']['oa'] = 'OA';
 
 $lang->my->featureBar['project']['doing']      = 'Doing';
 $lang->my->featureBar['project']['wait']       = 'Waiting';
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index 70defe1a7a..a75646bc7d 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -94,20 +94,6 @@ $lang->my->auditField->oaTitle['makeup']   = '%s application for makeup:%s';
 $lang->my->auditField->oaTitle['overtime'] = '%s application for overtime: %s';
 $lang->my->auditField->oaTitle['lieu']     = '%s application for lieu: %s';
 
-$lang->my->auditMenu = new stdclass();
-$lang->my->auditMenu->audit = new stdclass();
-$lang->my->auditMenu->audit->all      = 'All';
-$lang->my->auditMenu->audit->story    = 'Story';
-$lang->my->auditMenu->audit->testcase = 'Case';
-if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->auditMenu->audit->project = $lang->projectCommon;
-if($config->edition != 'open') $lang->my->auditMenu->audit->feedback = 'Feedback';
-if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->auditMenu->audit->oa = 'OA';
-
-$lang->my->contributeMenu = new stdclass();
-$lang->my->contributeMenu->audit = new stdclass();
-$lang->my->contributeMenu->audit->reviewedbyme = 'ReviewedByMe';
-$lang->my->contributeMenu->audit->createdbyme  = 'CreatedByMe';
-
 $lang->my->projectMenu = new stdclass();
 $lang->my->projectMenu->doing      = 'Doing';
 $lang->my->projectMenu->wait       = 'Waiting';
@@ -169,6 +155,9 @@ $lang->my->featureBar['todo']['cycle']           = 'Recurrence';
 $lang->my->featureBar['audit']['all']      = 'All';
 $lang->my->featureBar['audit']['story']    = 'Story';
 $lang->my->featureBar['audit']['testcase'] = 'Test case';
+if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->featureBar['audit']['project'] = $lang->projectCommon;
+if($config->edition != 'open') $lang->my->featureBar['audit']['feedback'] = 'Feedback';
+if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->featureBar['audit']['oa'] = 'OA';
 
 $lang->my->featureBar['project']['doing']      = 'Doing';
 $lang->my->featureBar['project']['wait']       = 'Waiting';
diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php
index 33be1faa33..e67590d444 100644
--- a/module/my/lang/fr.php
+++ b/module/my/lang/fr.php
@@ -94,20 +94,6 @@ $lang->my->auditField->oaTitle['makeup']   = '%s application for makeup:%s';
 $lang->my->auditField->oaTitle['overtime'] = '%s application for overtime: %s';
 $lang->my->auditField->oaTitle['lieu']     = '%s application for lieu: %s';
 
-$lang->my->auditMenu = new stdclass();
-$lang->my->auditMenu->audit = new stdclass();
-$lang->my->auditMenu->audit->all      = 'All';
-$lang->my->auditMenu->audit->story    = 'Story';
-$lang->my->auditMenu->audit->testcase = 'Case';
-if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->auditMenu->audit->project = $lang->projectCommon;
-if($config->edition != 'open') $lang->my->auditMenu->audit->feedback = 'Feedback';
-if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->auditMenu->audit->oa = 'OA';
-
-$lang->my->contributeMenu = new stdclass();
-$lang->my->contributeMenu->audit = new stdclass();
-$lang->my->contributeMenu->audit->reviewedbyme = 'ReviewedByMe';
-$lang->my->contributeMenu->audit->createdbyme  = 'CreatedByMe';
-
 $lang->my->projectMenu = new stdclass();
 $lang->my->projectMenu->doing      = 'Doing';
 $lang->my->projectMenu->wait       = 'Waiting';
@@ -169,6 +155,9 @@ $lang->my->featureBar['todo']['cycle']           = 'Récurrence';
 $lang->my->featureBar['audit']['all']      = 'All';
 $lang->my->featureBar['audit']['story']    = 'Story';
 $lang->my->featureBar['audit']['testcase'] = 'Test case';
+if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->featureBar['audit']['project'] = $lang->projectCommon;
+if($config->edition != 'open') $lang->my->featureBar['audit']['feedback'] = 'Feedback';
+if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->featureBar['audit']['oa'] = 'OA';
 
 $lang->my->featureBar['project']['doing']      = 'Doing';
 $lang->my->featureBar['project']['wait']       = 'Waiting';
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index ea3a3cee6d..e3eedd1d7e 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -94,20 +94,6 @@ $lang->my->auditField->oaTitle['makeup']   = '%s的补班申请：%s';
 $lang->my->auditField->oaTitle['overtime'] = '%s的加班申请：%s';
 $lang->my->auditField->oaTitle['lieu']     = '%s的调休申请：%s';
 
-$lang->my->auditMenu = new stdclass();
-$lang->my->auditMenu->audit = new stdclass();
-$lang->my->auditMenu->audit->all      = '所有';
-$lang->my->auditMenu->audit->story    = '需求';
-$lang->my->auditMenu->audit->testcase = '用例';
-if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->auditMenu->audit->project = $lang->projectCommon;
-if($config->edition != 'open') $lang->my->auditMenu->audit->feedback = '反馈';
-if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->auditMenu->audit->oa = '办公';
-
-$lang->my->contributeMenu = new stdclass();
-$lang->my->contributeMenu->audit = new stdclass();
-$lang->my->contributeMenu->audit->reviewedbyme = '由我评审';
-$lang->my->contributeMenu->audit->createdbyme  = '由我发起';
-
 $lang->my->projectMenu = new stdclass();
 $lang->my->projectMenu->doing      = '进行中';
 $lang->my->projectMenu->wait       = '未开始';
@@ -169,6 +155,9 @@ $lang->my->featureBar['todo']['cycle']           = '周期';
 $lang->my->featureBar['audit']['all']      = '全部';
 $lang->my->featureBar['audit']['story']    = '需求';
 $lang->my->featureBar['audit']['testcase'] = '用例';
+if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->featureBar['audit']['project'] = $lang->projectCommon;
+if($config->edition != 'open') $lang->my->featureBar['audit']['feedback'] = '反馈';
+if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->featureBar['audit']['oa'] = '办公';
 
 $lang->my->featureBar['project']['doing']      = '进行中';
 $lang->my->featureBar['project']['wait']       = '未开始';
diff --git a/module/my/model.php b/module/my/model.php
index 18f2c46b0e..89e57f22ea 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -1017,7 +1017,7 @@ class myModel extends model
 
         $flows = ($this->config->edition == 'open') ? array() : $this->dao->select('module,name')->from(TABLE_WORKFLOW)->where('module')->in($typeList)->andWhere('buildin')->eq(0)->fetchPairs('module', 'name');
         $menu  = new stdclass();
-        $menu->all = $this->lang->my->auditMenu->audit->all;
+        $menu->all = $this->lang->my->featureBar['audit']['all'];
         foreach($typeList as $type)
         {
             $this->app->loadLang($type);
diff --git a/module/my/view/audit.html.php b/module/my/view/audit.html.php
index 2344239a68..59172a19cd 100644
--- a/module/my/view/audit.html.php
+++ b/module/my/view/audit.html.php
@@ -57,7 +57,7 @@
 
       $typeName = '';
       if(isset($lang->{$review->type}->common)) $typeName = $lang->{$review->type}->common;
-      if($type == 'story') $typeName = $lang->my->auditMenu->audit->story;
+      if($type == 'story') $typeName = $lang->my->featureBar['audit']['story'];
       if($review->type == 'projectreview') $typeName = $lang->project->common;
       if(isset($flows[$review->type])) $typeName = $flows[$review->type];