diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index e5d9c85e6e..045df01c0c 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -23,6 +23,7 @@ $lang->resource->my->testcase = 'testCase'; $lang->resource->my->story = 'story'; $lang->resource->my->project = 'project'; $lang->resource->my->profile = 'profile'; +$lang->resource->my->dynamic = 'dynamic'; $lang->resource->my->editProfile = 'editProfile'; /* Todo. */ @@ -56,6 +57,7 @@ $lang->resource->story->review = 'lblReview'; $lang->resource->story->close = 'lblClose'; $lang->resource->story->activate= 'lblActivate'; $lang->resource->story->tasks = 'tasks'; +$lang->resource->story->report = 'reportChart'; $lang->resource->story->ajaxGetProjectStories = 'ajaxGetProjectStories'; $lang->resource->story->ajaxGetProductStories = 'ajaxGetProductStories'; @@ -112,6 +114,7 @@ $lang->resource->task->batchClose = 'batchClose'; $lang->resource->task->activate = 'activate'; $lang->resource->task->delete = 'delete'; $lang->resource->task->view = 'view'; +$lang->resource->task->export = 'export'; $lang->resource->task->confirmStoryChange = 'confirmStoryChange'; $lang->resource->task->ajaxGetUserTasks = 'ajaxGetUserTasks'; $lang->resource->task->ajaxGetProjectTasks = 'ajaxGetProjectTasks'; @@ -153,6 +156,7 @@ $lang->resource->testcase->create = 'create'; $lang->resource->testcase->view = 'view'; $lang->resource->testcase->edit = 'edit'; $lang->resource->testcase->delete = 'delete'; +$lang->resource->testcase->export = 'export'; $lang->resource->testcase->confirmStoryChange = 'confirmStoryChange'; /* Test task. */ @@ -184,6 +188,7 @@ $lang->resource->doc->delete = 'delete'; $lang->resource->company->index = 'index'; $lang->resource->company->browse = 'browse'; $lang->resource->company->edit = 'edit'; +$lang->resource->company->dynamic= 'dynamic'; /* Department. */ $lang->resource->dept->browse = 'browse'; @@ -209,6 +214,7 @@ $lang->resource->user->todo = 'todo'; $lang->resource->user->task = 'task'; $lang->resource->user->bug = 'bug'; $lang->resource->user->project= 'project'; +$lang->resource->user->dynamic= 'dynamic'; $lang->resource->user->profile= 'profile'; /* Tree. */ @@ -230,6 +236,16 @@ $lang->resource->search->select = 'select'; /* Admin. */ $lang->resource->admin->index = 'index'; +/* Extension. */ +$lang->resource->extension->browse = 'browse'; +$lang->resource->extension->obtain = 'obtain'; +$lang->resource->extension->install = 'install'; +$lang->resource->extension->uninstall = 'uninstall'; +$lang->resource->extension->activate = 'activate'; +$lang->resource->extension->deactivate = 'deactivate'; +$lang->resource->extension->upload = 'upload'; +$lang->resource->extension->erase = 'erase'; + /* Others. */ $lang->resource->api->getModel = 'getModel'; $lang->resource->file->download = 'download'; @@ -242,17 +258,7 @@ $lang->resource->misc->ping = 'ping'; $lang->resource->action->trash = 'trash'; $lang->resource->action->undelete = 'undelete'; -/* New privilege.*/ -$lang->group->newPriv['my']['testTask'] = 'testTask'; -$lang->group->newPriv['my']['testCase'] = 'testCase'; -$lang->group->newPriv['task']['activate'] = 'activate'; -$lang->group->newPriv['task']['close'] = 'close'; -$lang->group->newPriv['task']['batchClose'] = 'batchClose'; -$lang->group->newPriv['task']['finish'] = 'finish'; -$lang->group->newPriv['search']['select'] = 'select'; - /* Every version of new privilege. */ - $lang->changelog['1.0.1'][] = 'project-computeBurn'; $lang->changelog['1.1'][] = 'search-saveQuery'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 3b55cd4ce4..a9a7b29650 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -9,20 +9,22 @@ * @version $Id$ * @link http://www.zentao.net */ -$lang->story->browse = "Browse"; -$lang->story->create = "Create"; -$lang->story->change = "Change"; -$lang->story->changed = 'Changed'; -$lang->story->review = 'Review'; -$lang->story->edit = "Edit"; -$lang->story->close = 'Close'; -$lang->story->activate = 'Activate'; -$lang->story->delete = "Delete"; -$lang->story->view = "Info"; -$lang->story->tasks = "Tasks"; -$lang->story->taskCount = 'Tasks count'; -$lang->story->bugs = "Bug"; -$lang->story->linkStory = 'Related story'; +$lang->story->browse = "Browse"; +$lang->story->create = "Create"; +$lang->story->change = "Change"; +$lang->story->changed = 'Changed'; +$lang->story->review = 'Review'; +$lang->story->edit = "Edit"; +$lang->story->close = 'Close'; +$lang->story->activate = 'Activate'; +$lang->story->delete = "Delete"; +$lang->story->view = "Info"; +$lang->story->tasks = "Tasks"; +$lang->story->taskCount = 'Tasks count'; +$lang->story->bugs = "Bug"; +$lang->story->linkStory = 'Related story'; +$lang->story->export = "Export"; +$lang->story->reportChart = "Report"; $lang->story->common = 'Story'; $lang->story->id = 'ID'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index c8ad327595..48c42d1134 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -9,20 +9,22 @@ * @version $Id$ * @link http://www.zentao.net */ -$lang->story->browse = "需求列表"; -$lang->story->create = "新增需求"; -$lang->story->change = "变更"; -$lang->story->changed = '需求变更'; -$lang->story->review = '评审'; -$lang->story->edit = "编辑需求"; -$lang->story->close = '关闭'; -$lang->story->activate = '激活'; -$lang->story->delete = "删除需求"; -$lang->story->view = "需求详情"; -$lang->story->tasks = "相关任务"; -$lang->story->taskCount = '任务数'; -$lang->story->bugs = "Bug"; -$lang->story->linkStory = '关联需求'; +$lang->story->browse = "需求列表"; +$lang->story->create = "新增需求"; +$lang->story->change = "变更"; +$lang->story->changed = '需求变更'; +$lang->story->review = '评审'; +$lang->story->edit = "编辑需求"; +$lang->story->close = '关闭'; +$lang->story->activate = '激活'; +$lang->story->delete = "删除需求"; +$lang->story->view = "需求详情"; +$lang->story->tasks = "相关任务"; +$lang->story->taskCount = '任务数'; +$lang->story->bugs = "Bug"; +$lang->story->linkStory = '关联需求'; +$lang->story->export = "导出数据"; +$lang->story->reportChart = "统计报表"; $lang->story->common = '需求'; $lang->story->id = '编号'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index d3b4000fc9..9cf0ff0a29 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -22,6 +22,7 @@ $lang->task->close = "Close"; $lang->task->batchClose= "Batch close"; $lang->task->cancel = "Cancel"; $lang->task->activate = "Activate"; +$lang->task->export = "Export"; $lang->task->reportChart = "Report chart"; $lang->task->confirmStoryChange = "Confirm story change"; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 7ca9bd62fe..00faad1971 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -22,6 +22,7 @@ $lang->task->close = "关闭任务"; $lang->task->batchClose= "批量关闭"; $lang->task->cancel = "取消任务"; $lang->task->activate = "激活任务"; +$lang->task->export = "导出数据"; $lang->task->reportChart = "报表统计"; $lang->task->confirmStoryChange = "确认需求变动"; diff --git a/module/testcase/control.php b/module/testcase/control.php index 0a8bef538a..d20ea0567f 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -355,7 +355,7 @@ class testcase extends control /** * get data to export */ - public function exportData($fileName, $fileType) + public function export($fileName, $fileType) { $users = $this->loadModel('user')->getPairs(); $productID = $this->session->productID; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 1c35110200..c816c8d5e4 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -54,6 +54,7 @@ $lang->testcase->view = "Info"; $lang->testcase->edit = "Edit"; $lang->testcase->delete = "Delete"; $lang->testcase->browse = "Browse"; +$lang->testcase->export = "Export"; $lang->testcase->confirmStoryChange = 'Confirm story change'; $lang->testcase->deleteStep = 'Delete'; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 8ed46f6984..16296975b8 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -54,6 +54,7 @@ $lang->testcase->view = "用例详情"; $lang->testcase->edit = "编辑用例"; $lang->testcase->delete = "删除用例"; $lang->testcase->browse = "用例列表"; +$lang->testcase->export = "导出数据"; $lang->testcase->confirmStoryChange = '确认需求变动'; $lang->testcase->deleteStep = '删除';