From d05f18aa38f3b8cc3429bde08a8ac0648f887ff5 Mon Sep 17 00:00:00 2001 From: azhi Date: Mon, 5 Aug 2013 14:10:43 +0800 Subject: [PATCH] * finish task#1666. --- config/config.php | 2 +- module/common/lang/en.php | 3 +++ module/common/lang/menuOrder.php | 12 +++++++----- module/common/lang/zh-cn.php | 3 +++ module/lang/control.php | 24 ++++++++++++++++++++++++ module/lang/model.php | 15 +++++++++++++++ module/lang/view/index.html.php | 15 +++++++++++++++ 7 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 module/lang/control.php create mode 100644 module/lang/model.php create mode 100644 module/lang/view/index.html.php diff --git a/config/config.php b/config/config.php index e1dcc42680..d6bd0803c3 100644 --- a/config/config.php +++ b/config/config.php @@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}} /* Basic settings. */ $config = new config(); -$config->version = '4.3.beta'; // The version of zentaopms. Don't change it. +$config->version = '4.2'; // The version of zentaopms. Don't change it. $config->charset = 'UTF-8'; // The charset of zentaopms. $config->cookieLife = time() + 2592000; // The cookie life time. $config->timezone = 'Asia/Shanghai'; // The time zone setting, for more see http://www.php.net/manual/en/timezones.php diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 6bf934b244..468cd6d20d 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -272,6 +272,7 @@ $lang->admin = new stdclass(); $lang->admin->menu = new stdclass(); $lang->admin->menu->index = array('link' => 'Index|admin|index'); $lang->admin->menu->extension = array('link' => 'Extension|extension|browse', 'subModule' => 'extension,editor'); +$lang->admin->menu->lang = array('link' => 'Custom lang|lang|index', 'subModule' => 'lang'); $lang->admin->menu->mail = array('link' => 'Email|mail|index', 'subModule' => 'mail'); $lang->admin->menu->clearData = array('link' => 'Clear data|admin|cleardata'); $lang->admin->menu->convert = array('link' => 'Import|convert|index', 'subModule' => 'convert'); @@ -282,6 +283,7 @@ $lang->convert = new stdclass(); $lang->upgrade = new stdclass(); $lang->action = new stdclass(); $lang->extension = new stdclass(); +$lang->lang = new stdclass(); $lang->editor = new stdclass(); $lang->mail = new stdclass(); $lang->sso = new stdclass(); @@ -290,6 +292,7 @@ $lang->convert->menu = $lang->admin->menu; $lang->upgrade->menu = $lang->admin->menu; $lang->action->menu = $lang->admin->menu; $lang->extension->menu = $lang->admin->menu; +$lang->lang->menu = $lang->admin->menu; $lang->editor->menu = $lang->admin->menu; $lang->mail->menu = $lang->admin->menu; $lang->sso->menu = $lang->admin->menu; diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php index bd9e626afa..a22330d2d0 100644 --- a/module/common/lang/menuOrder.php +++ b/module/common/lang/menuOrder.php @@ -108,15 +108,17 @@ $lang->user->menuOrder = $lang->company->menuOrder; /* admin menu order. */ $lang->admin->menuOrder[5] = 'index'; $lang->admin->menuOrder[10] = 'extension'; -$lang->admin->menuOrder[15] = 'editor'; -$lang->admin->menuOrder[20] = 'mail'; -$lang->admin->menuOrder[25] = 'sso'; -$lang->admin->menuOrder[30] = 'convert'; -$lang->admin->menuOrder[35] = 'trashes'; +$lang->admin->menuOrder[15] = 'lang'; +$lang->admin->menuOrder[20] = 'editor'; +$lang->admin->menuOrder[25] = 'mail'; +$lang->admin->menuOrder[30] = 'sso'; +$lang->admin->menuOrder[35] = 'convert'; +$lang->admin->menuOrder[40] = 'trashes'; $lang->convert->menuOrder = $lang->admin->menuOrder; $lang->upgrade->menuOrder = $lang->admin->menuOrder; $lang->action->menuOrder = $lang->admin->menuOrder; $lang->extension->menuOrder = $lang->admin->menuOrder; +$lang->lang->menuOrder = $lang->admin->menuOrder; $lang->editor->menuOrder = $lang->admin->menuOrder; $lang->mail->menuOrder = $lang->admin->menuOrder; $lang->sso->menuOrder = $lang->admin->menuOrder; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index d4b4d523c5..1259c0d29b 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -272,6 +272,7 @@ $lang->admin = new stdclass(); $lang->admin->menu = new stdclass(); $lang->admin->menu->index = array('link' => '首页|admin|index'); $lang->admin->menu->extension = array('link' => '扩展|extension|browse', 'subModule' => 'extension,editor'); +$lang->admin->menu->lang = array('link' => '语言配置|lang|index', 'subModule' => 'lang'); $lang->admin->menu->mail = array('link' => '发信|mail|index', 'subModule' => 'mail'); $lang->admin->menu->clearData = array('link' => '清除数据|admin|cleardata'); $lang->admin->menu->convert = array('link' => '导入|convert|index', 'subModule' => 'convert'); @@ -282,6 +283,7 @@ $lang->convert = new stdclass(); $lang->upgrade = new stdclass(); $lang->action = new stdclass(); $lang->extension = new stdclass(); +$lang->lang = new stdclass(); $lang->editor = new stdclass(); $lang->mail = new stdclass(); $lang->sso = new stdclass(); @@ -290,6 +292,7 @@ $lang->convert->menu = $lang->admin->menu; $lang->upgrade->menu = $lang->admin->menu; $lang->action->menu = $lang->admin->menu; $lang->extension->menu = $lang->admin->menu; +$lang->lang->menu = $lang->admin->menu; $lang->editor->menu = $lang->admin->menu; $lang->mail->menu = $lang->admin->menu; $lang->sso->menu = $lang->admin->menu; diff --git a/module/lang/control.php b/module/lang/control.php new file mode 100644 index 0000000000..d882503c4d --- /dev/null +++ b/module/lang/control.php @@ -0,0 +1,24 @@ + + * @package xxx + * @version $Id$ + * @link http://www.zentao.net + */ +class lang extends control +{ + public function __construct() + { + parent::__construct(); + } + + public function index() + { + $this->display(); + } +} + diff --git a/module/lang/model.php b/module/lang/model.php new file mode 100644 index 0000000000..737e6c73b8 --- /dev/null +++ b/module/lang/model.php @@ -0,0 +1,15 @@ + + * @package xxx + * @version $Id$ + * @link http://www.zentao.net + */ +class langModel extends model +{ +} + diff --git a/module/lang/view/index.html.php b/module/lang/view/index.html.php new file mode 100644 index 0000000000..a802d36786 --- /dev/null +++ b/module/lang/view/index.html.php @@ -0,0 +1,15 @@ + + * @package xxx + * @version $Id$ + * @link http://www.zentao.net + */ +?> + +asdfasdf +