From 2625abc693c669c82a661a42429b766bbf0e07fa Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Tue, 12 Jan 2021 15:08:13 +0800
Subject: [PATCH] * Finish task #9021.

---
 module/common/lang/de.php        | 18 +++++++-----------
 module/common/lang/en.php        | 18 +++++++-----------
 module/common/lang/fr.php        | 18 +++++++-----------
 module/common/lang/menuOrder.php |  1 +
 module/common/lang/vi.php        | 18 +++++++-----------
 module/common/lang/zh-cn.php     | 18 +++++++-----------
 module/common/lang/zh-tw.php     | 18 +++++++-----------
 7 files changed, 43 insertions(+), 66 deletions(-)

diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index bda6329084..2f55709575 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -201,24 +201,20 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => 'Global Settings|subject|browse|', 'subModule' => 'holiday');
+$lang->system->menu->company   = array('link' => 'Global Settings|subject|browse|', 'subModule' => 'holiday,custom');
 $lang->system->menu->scrum     = array('link' => 'Scrum Model|custom|configurescrum|');
-$lang->system->menu->waterfall = array('link' => 'Waterfall Model|custom|estimate|', 'subModule' => 'stage');
+$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|');
 
 $lang->subject = new stdclass();
 $lang->subject->menu = new stdclass();
-$lang->subject->menu->subject = array('link' => 'Subject|subject|browse|');
-$lang->subject->menu->holiday = array('link' => 'Holiday|holiday|browse|');
-$lang->subject->menu->concept = array('link' => 'Story Concept|custom|browsestoryconcept|');
+$lang->subject->menu->subject  = array('link' => 'Subject|subject|browse|');
+$lang->subject->menu->holiday  = array('link' => 'Holiday|holiday|browse|');
+$lang->subject->menu->concept  = array('link' => 'Story Concept|custom|browsestoryconcept|');
+$lang->subject->menu->estimate = array('link' => 'Estimate|custom|estimate');
 
 $lang->holiday = new stdclass();
 $lang->holiday->menu = $lang->subject->menu;
 
-$lang->stage = new stdclass();
-$lang->stage->menu = new stdclass();
-$lang->stage->menu->estimate = array('link' => 'Estimate|custom|estimate');
-$lang->stage->menu->stage    = array('link' => 'Stage|stage|settype', 'subModule' => 'stage');
-
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
 
@@ -991,6 +987,6 @@ $lang->projectstory->menu->story       = array('link' => "{$lang->projectSRCommo
 $lang->projectstory->menu->track       = array('link' => 'Track|projectstory|track', 'subModule' => '');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'stage');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 18d01ca190..0398464aee 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -201,24 +201,20 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => 'Global Settings|subject|browse|', 'subModule' => 'holiday');
+$lang->system->menu->company   = array('link' => 'Global Settings|subject|browse|', 'subModule' => 'holiday,custom');
 $lang->system->menu->scrum     = array('link' => 'Scrum Model|custom|configurescrum|');
-$lang->system->menu->waterfall = array('link' => 'Waterfall Model|custom|estimate|', 'subModule' => 'stage');
+$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|');
 
 $lang->subject = new stdclass();
 $lang->subject->menu = new stdclass();
-$lang->subject->menu->subject = array('link' => 'Subject|subject|browse|');
-$lang->subject->menu->holiday = array('link' => 'Holiday|holiday|browse|');
-$lang->subject->menu->concept = array('link' => 'Story Concept|custom|browsestoryconcept|');
+$lang->subject->menu->subject  = array('link' => 'Subject|subject|browse|');
+$lang->subject->menu->holiday  = array('link' => 'Holiday|holiday|browse|');
+$lang->subject->menu->concept  = array('link' => 'Story Concept|custom|browsestoryconcept|');
+$lang->subject->menu->estimate = array('link' => 'Estimate|custom|estimate');
 
 $lang->holiday = new stdclass();
 $lang->holiday->menu = $lang->subject->menu;
 
-$lang->stage = new stdclass();
-$lang->stage->menu = new stdclass();
-$lang->stage->menu->estimate = array('link' => 'Estimate|custom|estimate');
-$lang->stage->menu->stage    = array('link' => 'Stage|stage|settype', 'subModule' => 'stage');
-
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
 
@@ -991,6 +987,6 @@ $lang->projectstory->menu->story       = array('link' => "{$lang->projectSRCommo
 $lang->projectstory->menu->track       = array('link' => 'Track|projectstory|track', 'subModule' => '');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'stage');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index c63b75af0a..f27bd23680 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -201,24 +201,20 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => 'Global Settings|subject|browse|', 'subModule' => 'holiday');
+$lang->system->menu->company   = array('link' => 'Global Settings|subject|browse|', 'subModule' => 'holiday,custom');
 $lang->system->menu->scrum     = array('link' => 'Scrum Model|custom|configurescrum|');
-$lang->system->menu->waterfall = array('link' => 'Waterfall Model|custom|estimate|', 'subModule' => 'stage');
+$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|');
 
 $lang->subject = new stdclass();
 $lang->subject->menu = new stdclass();
-$lang->subject->menu->subject = array('link' => 'Subject|subject|browse|');
-$lang->subject->menu->holiday = array('link' => 'Holiday|holiday|browse|');
-$lang->subject->menu->concept = array('link' => 'Story Concept|custom|browsestoryconcept|');
+$lang->subject->menu->subject  = array('link' => 'Subject|subject|browse|');
+$lang->subject->menu->holiday  = array('link' => 'Holiday|holiday|browse|');
+$lang->subject->menu->concept  = array('link' => 'Story Concept|custom|browsestoryconcept|');
+$lang->subject->menu->estimate = array('link' => 'Estimate|custom|estimate');
 
 $lang->holiday = new stdclass();
 $lang->holiday->menu = $lang->subject->menu;
 
-$lang->stage = new stdclass();
-$lang->stage->menu = new stdclass();
-$lang->stage->menu->estimate = array('link' => 'Estimate|custom|estimate');
-$lang->stage->menu->stage    = array('link' => 'Stage|stage|settype', 'subModule' => 'stage');
-
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
 
@@ -994,6 +990,6 @@ $lang->projectstory->menu->story       = array('link' => "{$lang->projectSRCommo
 $lang->projectstory->menu->track       = array('link' => 'Track|projectstory|track', 'subModule' => '');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'stage');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index 67c92f041e..cb6a8440a0 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -149,6 +149,7 @@ $lang->system->menuOrder[15] = 'waterfall';
 $lang->subject->menuOrder[5]  = 'subject';
 $lang->subject->menuOrder[10] = 'holiday';
 $lang->subject->menuOrder[15] = 'concept';
+$lang->subject->menuOrder[20] = 'estimate';
 
 /* admin menu order. */
 $lang->admin->menuOrder[5]  = 'index';
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 01f0cd9544..5210b7071e 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -201,24 +201,20 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => 'Global Settings|subject|browse|', 'subModule' => 'holiday');
+$lang->system->menu->company   = array('link' => 'Global Settings|subject|browse|', 'subModule' => 'holiday,custom');
 $lang->system->menu->scrum     = array('link' => 'Scrum Model|custom|configurescrum|');
-$lang->system->menu->waterfall = array('link' => 'Waterfall Model|custom|estimate|', 'subModule' => 'stage');
+$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|');
 
 $lang->subject = new stdclass();
 $lang->subject->menu = new stdclass();
-$lang->subject->menu->subject = array('link' => 'Subject|subject|browse|');
-$lang->subject->menu->holiday = array('link' => 'Holiday|holiday|browse|');
-$lang->subject->menu->concept = array('link' => 'Story Concept|custom|browsestoryconcept|');
+$lang->subject->menu->subject  = array('link' => 'Subject|subject|browse|');
+$lang->subject->menu->holiday  = array('link' => 'Holiday|holiday|browse|');
+$lang->subject->menu->concept  = array('link' => 'Story Concept|custom|browsestoryconcept|');
+$lang->subject->menu->estimate = array('link' => 'Estimate|custom|estimate');
 
 $lang->holiday = new stdclass();
 $lang->holiday->menu = $lang->subject->menu;
 
-$lang->stage = new stdclass();
-$lang->stage->menu = new stdclass();
-$lang->stage->menu->estimate = array('link' => 'Estimate|custom|estimate');
-$lang->stage->menu->stage    = array('link' => 'Stage|stage|settype', 'subModule' => 'stage');
-
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
 
@@ -994,6 +990,6 @@ $lang->projectstory->menu->story       = array('link' => "{$lang->projectSRCommo
 $lang->projectstory->menu->track       = array('link' => 'Track|projectstory|track', 'subModule' => '');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'job', 'jenkins', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'stage');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 79ee26da00..0c235e64c2 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -201,24 +201,20 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => '全局设置|subject|browse|', 'subModule' => 'holiday');
+$lang->system->menu->company   = array('link' => '全局设置|subject|browse|', 'subModule' => 'holiday,custom');
 $lang->system->menu->scrum     = array('link' => '敏捷模型|custom|configurescrum|');
-$lang->system->menu->waterfall = array('link' => '瀑布模型|custom|estimate|', 'subModule' => 'stage');
+$lang->system->menu->waterfall = array('link' => '瀑布模型|stage|settype|');
 
 $lang->subject = new stdclass();
 $lang->subject->menu = new stdclass();
-$lang->subject->menu->subject = array('link' => '支出科目|subject|browse|');
-$lang->subject->menu->holiday = array('link' => '节假日|holiday|browse|');
-$lang->subject->menu->concept = array('link' => '需求概念|custom|browsestoryconcept|');
+$lang->subject->menu->subject  = array('link' => '支出科目|subject|browse|');
+$lang->subject->menu->holiday  = array('link' => '节假日|holiday|browse|');
+$lang->subject->menu->concept  = array('link' => '需求概念|custom|browsestoryconcept|');
+$lang->subject->menu->estimate = array('link' => '估算|custom|estimate');
 
 $lang->holiday = new stdclass();
 $lang->holiday->menu = $lang->subject->menu;
 
-$lang->stage = new stdclass();
-$lang->stage->menu = new stdclass();
-$lang->stage->menu->estimate = array('link' => '估算|custom|estimate');
-$lang->stage->menu->stage    = array('link' => '阶段|stage|settype', 'subModule' => 'stage');
-
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
 
@@ -992,6 +988,6 @@ $lang->projectstory->menu->story       = array('link' => "{$lang->projectSRCommo
 $lang->projectstory->menu->track       = array('link' => '跟踪矩阵|projectstory|track', 'subModule' => '');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 10cf35001b..b641da6087 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -194,24 +194,20 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => '全局設置|subject|browse|', 'subModule' => 'holiday');
+$lang->system->menu->company   = array('link' => '全局設置|subject|browse|', 'subModule' => 'holiday,custom');
 $lang->system->menu->scrum     = array('link' => '敏捷模型|custom|configurescrum|');
-$lang->system->menu->waterfall = array('link' => '瀑布模型|custom|estimate|', 'subModule' => 'stage');
+$lang->system->menu->waterfall = array('link' => '瀑布模型|stage|settype|');
 
 $lang->subject = new stdclass();
 $lang->subject->menu = new stdclass();
-$lang->subject->menu->subject = array('link' => '科目|subject|browse|');
-$lang->subject->menu->holiday = array('link' => '節假日|holiday|browse|');
-$lang->subject->menu->concept = array('link' => '需求概念|custom|browsestoryconcept|');
+$lang->subject->menu->subject  = array('link' => '科目|subject|browse|');
+$lang->subject->menu->holiday  = array('link' => '節假日|holiday|browse|');
+$lang->subject->menu->concept  = array('link' => '需求概念|custom|browsestoryconcept|');
+$lang->subject->menu->estimate = array('link' => '估算|custom|estimate');
 
 $lang->holiday = new stdclass();
 $lang->holiday->menu = $lang->subject->menu;
 
-$lang->stage = new stdclass();
-$lang->stage->menu = new stdclass();
-$lang->stage->menu->estimate = array('link' => '估算|custom|estimate');
-$lang->stage->menu->stage    = array('link' => '階段|stage|settype', 'subModule' => 'stage');
-
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
 
@@ -987,6 +983,6 @@ $lang->projectstory->menu->story       = array('link' => "{$lang->projectSRCommo
 $lang->projectstory->menu->track       = array('link' => '跟蹤矩陣|projectstory|track', 'subModule' => '');
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'stage');
 
 include (dirname(__FILE__) . '/menuOrder.php');