From ce494052c51b8d2d1b486d6809b1d26f8837f87f Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Thu, 10 Sep 2020 13:47:14 +0800
Subject: [PATCH] * Fix my menu and framework control.

---
 framework/control.class.php      | 2 +-
 module/common/lang/en.php        | 2 +-
 module/common/lang/menuOrder.php | 2 +-
 module/common/lang/zh-cn.php     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/framework/control.class.php b/framework/control.class.php
index f15c322e18..5c3e5575f8 100644
--- a/framework/control.class.php
+++ b/framework/control.class.php
@@ -33,7 +33,7 @@ class control extends baseControl
     {
         parent::__construct($moduleName, $methodName, $appName);
 
-        if(defined('IN_USE') or (defined('RUN_MODE') and RUN_MODE == 'api')) $this->setConcept();
+        //if(defined('IN_USE') or (defined('RUN_MODE') and RUN_MODE == 'api')) $this->setConcept();
 
         if(!isset($this->config->bizVersion)) return false;
 
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 8ec2802eb8..a4afbb5147 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -220,7 +220,7 @@ $lang->my = new stdclass();
 $lang->my->menu = new stdclass();
 
 $lang->my->menu->index          = 'Home|my|index';
-$lang->my->menu->todo           = 'Todo|my|todo|';
+$lang->my->menu->calendar       = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');;
 $lang->my->menu->program        = array('link' => 'Program|my|program|');
 $lang->my->menu->task           = array('link' => 'Task|my|task|', 'subModule' => 'task');
 $lang->my->menu->bug            = array('link' => 'Bug|my|bug|',   'subModule' => 'bug');
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index cae4c55838..df2fbe650c 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -30,7 +30,7 @@ $lang->index->menuOrder[10] = 'project';
 
 /* my menu order. */
 $lang->my->menuOrder[5]  = 'index';
-$lang->my->menuOrder[10] = 'todo';
+$lang->my->menuOrder[10] = 'calendar';
 $lang->my->menuOrder[12] = 'program';
 $lang->my->menuOrder[20] = 'myProject';
 $lang->my->menuOrder[25] = 'review';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 3b9df14377..14f36c1bb5 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -220,7 +220,7 @@ $lang->my = new stdclass();
 $lang->my->menu = new stdclass();
 
 $lang->my->menu->index            = '首页|my|index';
-$lang->my->menu->todo             = '待办|my|todo|';
+$lang->my->menu->calendar         = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->program          = array('link' => '项目|my|program|');
 $lang->my->menu->task             = array('link' => '任务|my|task|', 'subModule' => 'task');
 $lang->my->menu->bug              = array('link' => 'Bug|my|bug|', 'subModule' => 'bug');