From a9e6dcc529840cd357e19dc726a05ae874c9c38a Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 2 Mar 2015 14:24:44 +0800
Subject: [PATCH]  * change for group priv.

---
 module/cron/config.php                   |  2 +-
 module/cron/lang/en.php                  | 47 ++++++++++++++++++++++++
 module/cron/lang/zh-cn.php               |  5 ++-
 module/dev/lang/en.php                   | 14 +++++++
 module/group/lang/resource.php           | 40 ++++++++++++++++++++
 module/mail/lang/en.php                  |  2 +
 module/mail/lang/zh-cn.php               |  2 +
 module/project/view/taskheader.html.php  |  2 +-
 module/testcase/view/caseheader.html.php |  2 +-
 module/testtask/view/caseheader.html.php |  2 +-
 10 files changed, 112 insertions(+), 6 deletions(-)
 create mode 100644 module/cron/lang/en.php

diff --git a/module/cron/config.php b/module/cron/config.php
index 48d311f2a5..11de4238d2 100644
--- a/module/cron/config.php
+++ b/module/cron/config.php
@@ -5,4 +5,4 @@ $config->cron->edit   = new stdclass();
 $config->cron->create->requiredFields = 'm,h,dom,mon,dow,command';
 $config->cron->edit->requiredFields = 'm,h,dom,mon,dow,command';
 
-$config->cron->maxRunDays = 3;
+$config->cron->maxRunDays = 8;
diff --git a/module/cron/lang/en.php b/module/cron/lang/en.php
new file mode 100644
index 0000000000..f08d350eb7
--- /dev/null
+++ b/module/cron/lang/en.php
@@ -0,0 +1,47 @@
+<?php
+$lang->cron->common  = 'Cron';
+$lang->cron->index   = 'Index';
+$lang->cron->list    = 'List';
+$lang->cron->create  = 'Create';
+$lang->cron->edit    = 'Edit';
+$lang->cron->delete  = 'Delete';
+$lang->cron->toggle  = 'Activation/Disable';
+$lang->cron->turnon  = 'Open/Close';
+
+$lang->cron->m        = 'Minute';
+$lang->cron->h        = 'Hour';
+$lang->cron->dom      = 'Day';
+$lang->cron->mon      = 'Month';
+$lang->cron->dow      = 'Week';
+$lang->cron->command  = 'Command';
+$lang->cron->status   = 'Status';
+$lang->cron->type     = 'Type';
+$lang->cron->remark   = 'Remark';
+$lang->cron->lastTime = 'Last run time';
+
+$lang->cron->turnonList['1'] = 'Open';
+$lang->cron->turnonList['0'] = 'Close';
+
+$lang->cron->statusList['normal']  = 'Normal';
+$lang->cron->statusList['running'] = 'Running';
+$lang->cron->statusList['stop']    = 'Stop';
+
+$lang->cron->typeList['zentao'] = 'Self call';
+$lang->cron->typeList['system'] = 'System command';
+
+$lang->cron->toggleList['start'] = 'Activation';
+$lang->cron->toggleList['stop']  = 'Disable';
+
+$lang->cron->confirmDelete = 'Do you want to delete the task?';
+$lang->cron->introduction  = <<<EOD
+<p>Timing tasks such as compute burn , backup. Absolve themselves of layout timing task.</p>
+<p>This function has yet to be perfect, so the function is turned off by default</p>
+<p>Whether to open the function? <a href="%s" target='hiddenwin'>Open timing task</a></p>
+EOD;
+
+$lang->cron->notice = new stdclass();
+$lang->cron->notice->m   = 'Range : 0-59，"*" express the range of numbers, "/" express "Every", "-" express digital range.';
+$lang->cron->notice->h   = 'Range : 0-23';
+$lang->cron->notice->dom = 'Range : 1-31';
+$lang->cron->notice->mon = 'Range : 1-12';
+$lang->cron->notice->dow = 'Range : 0-6';
diff --git a/module/cron/lang/zh-cn.php b/module/cron/lang/zh-cn.php
index af6da9ef70..8bf433ba6e 100644
--- a/module/cron/lang/zh-cn.php
+++ b/module/cron/lang/zh-cn.php
@@ -1,5 +1,6 @@
 <?php
-$lang->cron->common  = '计划任务';
+$lang->cron->common  = '定时任务';
+$lang->cron->index   = '首页';
 $lang->cron->list    = '任务列表';
 $lang->cron->create  = '添加';
 $lang->cron->edit    = '编辑';
@@ -39,7 +40,7 @@ $lang->cron->introduction  = <<<EOD
 EOD;
 
 $lang->cron->notice = new stdclass();
-$lang->cron->notice->m   = '取值范围:0-59，"*"代表取值范围内的数字，"/"代表"每"， "-"代表从数字范围。';
+$lang->cron->notice->m   = '取值范围:0-59，"*"代表取值范围内的数字，"/"代表"每"， "-"代表数字范围。';
 $lang->cron->notice->h   = '取值范围:0-23';
 $lang->cron->notice->dom = '取值范围:1-31';
 $lang->cron->notice->mon = '取值范围:1-12';
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index e69de29bb2..b62689b604 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -0,0 +1,14 @@
+<?php
+$lang->dev->common = 'Dev';
+$lang->dev->api    = 'API';
+$lang->dev->db     = 'Database';
+$lang->dev->editor = 'Editor';
+$lang->dev->dbList = 'Datebases';
+
+$lang->dev->fields = array();
+$lang->dev->fields['id']     = 'ID';
+$lang->dev->fields['name']   = 'Field';
+$lang->dev->fields['desc']   = 'Desc';
+$lang->dev->fields['type']   = 'Type';
+$lang->dev->fields['length'] = 'Length';
+$lang->dev->fields['null']   = 'Empty';
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 51368836a1..bc0ab774a0 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -53,6 +53,8 @@ $lang->moduleOrder[155] = 'api';
 $lang->moduleOrder[160] = 'file';
 $lang->moduleOrder[165] = 'misc';
 $lang->moduleOrder[170] = 'backup';
+$lang->moduleOrder[175] = 'cron';
+$lang->moduleOrder[180] = 'dev';
 
 $lang->resource = new stdclass();
 
@@ -535,6 +537,9 @@ $lang->resource->mail->edit   = 'edit';
 $lang->resource->mail->save   = 'save';
 $lang->resource->mail->test   = 'test';
 $lang->resource->mail->reset  = 'reset';
+$lang->resource->mail->browse = 'browse';
+$lang->resource->mail->delete = 'delete';
+$lang->resource->mail->batchDelete = 'batchDelete';
 
 $lang->mail->methodOrder[5]  = 'index';
 $lang->mail->methodOrder[10] = 'detect';
@@ -542,6 +547,9 @@ $lang->mail->methodOrder[15] = 'edit';
 $lang->mail->methodOrder[20] = 'save';
 $lang->mail->methodOrder[25] = 'test';
 $lang->mail->methodOrder[30] = 'reset';
+$lang->mail->methodOrder[35] = 'browse';
+$lang->mail->methodOrder[40] = 'delete';
+$lang->mail->methodOrder[45] = 'batchDelete';
 
 /* custom. */
 $lang->resource->custom = new stdclass();
@@ -825,6 +833,28 @@ $lang->backup->methodOrder[10] = 'backup';
 $lang->backup->methodOrder[15] = 'restore';
 $lang->backup->methodOrder[20] = 'delete';
 
+$lang->resource->cron = new stdclass();
+$lang->resource->cron->index   = 'index';
+$lang->resource->cron->turnon  = 'turnon';
+$lang->resource->cron->create  = 'create';
+$lang->resource->cron->edit    = 'edit';
+$lang->resource->cron->toggle  = 'toggle';
+$lang->resource->cron->delete  = 'delete';
+
+$lang->cron->methodOrder[5]  = 'index';
+$lang->cron->methodOrder[10] = 'turnon';
+$lang->cron->methodOrder[15] = 'create';
+$lang->cron->methodOrder[20] = 'edit';
+$lang->cron->methodOrder[25] = 'toggle';
+$lang->cron->methodOrder[30] = 'delete';
+
+$lang->resource->dev = new stdclass();
+$lang->resource->dev->api = 'api';
+$lang->resource->dev->db  = 'db';
+
+$lang->dev->methodOrder[5]  = 'api';
+$lang->dev->methodOrder[10] = 'db';
+
 /* Every version of new privilege. */
 $lang->changelog['1.0.1'][] = 'project-computeBurn';
 
@@ -1015,3 +1045,13 @@ $lang->changelog['6.4'][] = 'release-linkBug';
 $lang->changelog['6.4'][] = 'release-unlinkBug';
 $lang->changelog['6.4'][] = 'release-batchUnlinkBug';
 $lang->changelog['6.4'][] = 'story-batchAssignTo';
+
+$lang->changelog['7.1'][] = 'cron-index';
+$lang->changelog['7.1'][] = 'cron-turnon';
+$lang->changelog['7.1'][] = 'cron-create';
+$lang->changelog['7.1'][] = 'cron-edit';
+$lang->changelog['7.1'][] = 'cron-toggle';
+$lang->changelog['7.1'][] = 'cron-delete';
+$lang->changelog['7.1'][] = 'mail-browse';
+$lang->changelog['7.1'][] = 'mail-delete';
+$lang->changelog['7.1'][] = 'mail-batchDelete';
diff --git a/module/mail/lang/en.php b/module/mail/lang/en.php
index 2b0a9e112d..7d22165893 100755
--- a/module/mail/lang/en.php
+++ b/module/mail/lang/en.php
@@ -7,6 +7,8 @@ $lang->mail->save   = 'Successfully saved';
 $lang->mail->test   = 'Testing';
 $lang->mail->reset  = 'Reset';
 $lang->mail->browse = 'Mail list';
+$lang->mail->delete = 'Delete mail';
+$lang->mail->batchDelete = 'Batch delete';
 
 $lang->mail->turnon      = 'Turnon';
 $lang->mail->async       = 'Asynchronous';
diff --git a/module/mail/lang/zh-cn.php b/module/mail/lang/zh-cn.php
index 51df961c36..e6ff6c4e2e 100755
--- a/module/mail/lang/zh-cn.php
+++ b/module/mail/lang/zh-cn.php
@@ -7,6 +7,8 @@ $lang->mail->save   = '成功保存';
 $lang->mail->test   = '测试发信';
 $lang->mail->reset  = '重置';
 $lang->mail->browse = '邮件列表';
+$lang->mail->delete = '删除邮件';
+$lang->mail->batchDelete = '批量删除';
 
 $lang->mail->turnon      = '是否打开';
 $lang->mail->async       = '异步发送';
diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php
index 0903651910..e893318413 100644
--- a/module/project/view/taskheader.html.php
+++ b/module/project/view/taskheader.html.php
@@ -91,6 +91,6 @@
 $headerHooks = glob(dirname(dirname(__FILE__)) . "/ext/view/featurebar.*.html.hook.php");
 if(!empty($headerHooks))
 {
-    foreach($headerHooks as $fileName) helper::import($fileName);
+    foreach($headerHooks as $fileName) include($fileName);
 }
 ?>
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index fd0d17ea2c..299231b280 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -60,6 +60,6 @@
 $headerHooks = glob(dirname(dirname(__FILE__)) . "/ext/view/featurebar.*.html.hook.php");
 if(!empty($headerHooks))
 {
-    foreach($headerHooks as $fileName) helper::import($fileName);
+    foreach($headerHooks as $fileName) include($fileName);
 }
 ?>
diff --git a/module/testtask/view/caseheader.html.php b/module/testtask/view/caseheader.html.php
index 220bcb4096..60a6f22bb9 100644
--- a/module/testtask/view/caseheader.html.php
+++ b/module/testtask/view/caseheader.html.php
@@ -43,6 +43,6 @@
 $headerHooks = glob(dirname(dirname(__FILE__)) . "/ext/view/featurebar.*.html.hook.php");
 if(!empty($headerHooks))
 {
-    foreach($headerHooks as $fileName) helper::import($fileName);
+    foreach($headerHooks as $fileName) include($fileName);
 }
 ?>