diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index 6d4b6a7c24..e355326581 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -145,6 +145,11 @@ $lang->system->menuOrder[5]  = 'company';
 $lang->system->menuOrder[10] = 'scrum';
 $lang->system->menuOrder[15] = 'waterfall';
 
+/* system menu order. */
+$lang->subject->menuOrder[5]  = 'subject';
+$lang->subject->menuOrder[10] = 'holiday';
+$lang->subject->menuOrder[15] = 'concept';
+
 /* admin menu order. */
 $lang->admin->menuOrder[5]  = 'index';
 $lang->admin->menuOrder[9]  = 'company';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index a1f45f63be..b4bdf9505d 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -204,7 +204,7 @@ $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', 'alias' => 'browse,create,edit,batchcreate');
+$lang->stage->menu->stage    = array('link' => '阶段|stage|settype', 'subModule' => 'stage');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -950,6 +950,6 @@ $lang->waterfallproduct->menu->requirement = array('link' => "{$URCommon}|produc
 $lang->waterfallproduct->menu->story       = array('link' => "{$SRCommon}|product|browse|productID={PRODUCT}");
 
 $lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'auditcl', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search');
 
 include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 11b3c86048..f8ed15679f 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1156,7 +1156,7 @@ $lang->resource->custom->working          = 'working';
 $lang->resource->custom->setPublic        = 'setPublic';
 $lang->resource->custom->timezone         = 'timezone';
 $lang->resource->custom->estimate         = 'estimate';
-$lang->resource->custom->setStoryContcept = 'setStoryContcept';
+$lang->resource->custom->setStoryConcept  = 'setStoryConcept';
 $lang->resource->custom->configureScrum   = 'configureScrum';
 
 $lang->custom->methodOrder[5]  = 'index';
diff --git a/module/holiday/control.php b/module/holiday/control.php
index e1e15ae6c5..49294e298a 100644
--- a/module/holiday/control.php
+++ b/module/holiday/control.php
@@ -31,6 +31,10 @@ class holiday extends control
      */
     public function browse($year = '')
     {
+        $this->lang->menugroup->holiday  = ''; 
+        $this->lang->holiday->menu = $this->lang->subject->menu;
+        $this->lang->holiday->menuOrder = $this->lang->subject->menuOrder;
+
         $holidays = $this->holiday->getList($year);
         $yearList = $this->holiday->getYearPairs();