diff --git a/module/block/control.php b/module/block/control.php index 1f8fc9f8a6..ed792d5217 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -12,8 +12,8 @@ class block extends control { /** - * construct. - * + * construct. + * * @access public * @return void */ @@ -26,10 +26,10 @@ class block extends control } /** - * Block admin. - * - * @param int $id - * @param string $module + * Block admin. + * + * @param int $id + * @param string $module * @access public * @return void */ @@ -78,13 +78,13 @@ class block extends control $this->display(); } - /** - * Set params when type is rss or html. - * - * @param int $id - * @param string $type - * @access public - * @return void + /** + * Set params when type is rss or html. + * + * @param int $id + * @param string $type + * @access public + * @return void */ public function set($id, $type, $source = '') { @@ -92,7 +92,7 @@ class block extends control { $source = isset($this->lang->block->moduleList[$source]) ? $source : ''; $this->block->save($id, $source, $type, $this->session->blockModule); - if(dao::isError()) die(js::error(dao::geterror())); + if(dao::isError()) die(js::error(dao::geterror())); die(js::reload('parent')); } @@ -115,26 +115,26 @@ class block extends control $this->view->type = $type; $this->view->id = $id; $this->view->block = ($block) ? $block : array(); - $this->display(); + $this->display(); } /** - * Delete block - * - * @param int $id - * @param string $sys - * @param string $type + * Delete block + * + * @param int $id + * @param string $sys + * @param string $type * @access public * @return void */ public function delete($id, $module = 'my', $type = 'delete') - { + { if($type == 'hidden') - { + { $this->dao->update(TABLE_BLOCK)->set('hidden')->eq(1)->where('`id`')->eq($id)->andWhere('account')->eq($this->app->user->account)->andWhere('module')->eq($module)->exec(); } else - { + { $this->dao->delete()->from(TABLE_BLOCK)->where('`id`')->eq($id)->andWhere('account')->eq($this->app->user->account)->andWhere('module')->eq($module)->exec(); } if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); @@ -144,10 +144,10 @@ class block extends control /** * Sort block. - * - * @param string $oldOrder - * @param string $newOrder - * @param string $module + * + * @param string $oldOrder + * @param string $newOrder + * @param string $module * @access public * @return void */ @@ -155,7 +155,7 @@ class block extends control { $orders = explode(',', $orders); $blockList = $this->block->getBlockList($module); - + foreach ($orders as $order => $blockID) { $block = $blockList[$blockID]; @@ -199,8 +199,8 @@ class block extends control /** * Display dashboard for app. - * - * @param string $module + * + * @param string $module * @access public * @return void */ @@ -272,7 +272,7 @@ class block extends control /** * latest dynamic. - * + * * @access public * @return void */ @@ -285,7 +285,7 @@ class block extends control /** * Welcome block. - * + * * @access public * @return void */ @@ -317,9 +317,9 @@ class block extends control } /** - * Print block. - * - * @param int $id + * Print block. + * + * @param int $id * @access public * @return void */ @@ -361,13 +361,13 @@ class block extends control { $html = $this->fetch('block', 'welcome'); } - + echo $html; } /** * Main function. - * + * * @access public * @return void */ @@ -383,7 +383,7 @@ class block extends control $mode = strtolower($this->get->mode); if($mode == 'getblocklist') - { + { $blocks = $this->block->getAvailableBlocks($module); if(!$this->selfCall) { @@ -401,13 +401,13 @@ class block extends control echo '
[Steps]
\n"; @@ -334,18 +338,18 @@ $lang->bug->report->bugsPerProject->graph->xAxisName = $lang->projectCommon; $lang->bug->report->bugsPerBuild->graph->xAxisName = 'Build'; $lang->bug->report->bugsPerModule->graph->xAxisName = 'Module'; -$lang->bug->report->openedBugsPerDay->type = 'bar'; +$lang->bug->report->openedBugsPerDay->type = 'bar'; $lang->bug->report->openedBugsPerDay->graph->xAxisName = 'Date'; -$lang->bug->report->resolvedBugsPerDay->type = 'bar'; +$lang->bug->report->resolvedBugsPerDay->type = 'bar'; $lang->bug->report->resolvedBugsPerDay->graph->xAxisName = 'Date'; -$lang->bug->report->closedBugsPerDay->type = 'bar'; +$lang->bug->report->closedBugsPerDay->type = 'bar'; $lang->bug->report->closedBugsPerDay->graph->xAxisName = 'Date'; -$lang->bug->report->openedBugsPerUser->graph->xAxisName = 'User'; -$lang->bug->report->resolvedBugsPerUser->graph->xAxisName= 'User'; -$lang->bug->report->closedBugsPerUser->graph->xAxisName = 'User'; +$lang->bug->report->openedBugsPerUser->graph->xAxisName = 'User'; +$lang->bug->report->resolvedBugsPerUser->graph->xAxisName = 'User'; +$lang->bug->report->closedBugsPerUser->graph->xAxisName = 'User'; $lang->bug->report->bugsPerSeverity->graph->xAxisName = 'Priority'; $lang->bug->report->bugsPerResolution->graph->xAxisName = 'Solution'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 84c920310f..f1c39f24a2 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -103,24 +103,26 @@ $lang->bug->copy = '复制Bug'; $lang->bug->search = '搜索'; /* 查询条件列表。*/ -$lang->bug->assignToMe = '指派给我'; -$lang->bug->openedByMe = '由我创建'; -$lang->bug->resolvedByMe = '由我解决'; -$lang->bug->closedByMe = '由我关闭'; -$lang->bug->assignToNull = '未指派'; -$lang->bug->unResolved = '未解决'; -$lang->bug->toClosed = '待关闭'; -$lang->bug->unclosed = '未关闭'; -$lang->bug->unconfirmed = '未确认'; -$lang->bug->longLifeBugs = '久未处理'; -$lang->bug->postponedBugs = '被延期'; -$lang->bug->overdueBugs = '过期Bug'; -$lang->bug->allBugs = '所有'; -$lang->bug->byQuery = '搜索'; -$lang->bug->needConfirm = '需求变动'; -$lang->bug->allProduct = '所有' . $lang->productCommon; -$lang->bug->my = '我的'; -$lang->bug->yesterdayResolved = '昨天解决'; +$lang->bug->assignToMe = '指派给我'; +$lang->bug->openedByMe = '由我创建'; +$lang->bug->resolvedByMe = '由我解决'; +$lang->bug->closedByMe = '由我关闭'; +$lang->bug->assignToNull = '未指派'; +$lang->bug->unResolved = '未解决'; +$lang->bug->toClosed = '待关闭'; +$lang->bug->unclosed = '未关闭'; +$lang->bug->unconfirmed = '未确认'; +$lang->bug->longLifeBugs = '久未处理'; +$lang->bug->postponedBugs = '被延期'; +$lang->bug->overdueBugs = '过期Bug'; +$lang->bug->allBugs = '所有'; +$lang->bug->byQuery = '搜索'; +$lang->bug->needConfirm = '需求变动'; +$lang->bug->allProduct = '所有' . $lang->productCommon; +$lang->bug->my = '我的'; +$lang->bug->yesterdayResolved = '昨天解决'; +$lang->bug->yesterdayConfirmed = '昨天确认'; +$lang->bug->yesterdayClosed = '昨天关闭'; $lang->bug->assignToMeAB = '指派给我'; $lang->bug->openedByMeAB = '由我创建'; @@ -165,6 +167,8 @@ $lang->bug->remindTask = '该Bug已经转化为任务,是否更新 $lang->bug->skipClose = 'Bug %s 不是已解决状态,不能关闭。'; $lang->bug->applyTemplate = '应用模板'; $lang->bug->confirmDeleteTemplate = '您确认要删除该模板吗?'; +$lang->bug->hasSubmittedTest = '开发已提交测试申请,'; +$lang->bug->nowToTest = '现在去测试'; /* 模板。*/ $lang->bug->tplStep = "[步骤]
"; @@ -334,18 +338,18 @@ $lang->bug->report->bugsPerProject->graph->xAxisName = $lang->projectCommon; $lang->bug->report->bugsPerBuild->graph->xAxisName = '版本'; $lang->bug->report->bugsPerModule->graph->xAxisName = '模块'; -$lang->bug->report->openedBugsPerDay->type = 'bar'; +$lang->bug->report->openedBugsPerDay->type = 'bar'; $lang->bug->report->openedBugsPerDay->graph->xAxisName = '日期'; -$lang->bug->report->resolvedBugsPerDay->type = 'bar'; +$lang->bug->report->resolvedBugsPerDay->type = 'bar'; $lang->bug->report->resolvedBugsPerDay->graph->xAxisName = '日期'; -$lang->bug->report->closedBugsPerDay->type = 'bar'; +$lang->bug->report->closedBugsPerDay->type = 'bar'; $lang->bug->report->closedBugsPerDay->graph->xAxisName = '日期'; -$lang->bug->report->openedBugsPerUser->graph->xAxisName = '用户'; -$lang->bug->report->resolvedBugsPerUser->graph->xAxisName= '用户'; -$lang->bug->report->closedBugsPerUser->graph->xAxisName = '用户'; +$lang->bug->report->openedBugsPerUser->graph->xAxisName = '用户'; +$lang->bug->report->resolvedBugsPerUser->graph->xAxisName = '用户'; +$lang->bug->report->closedBugsPerUser->graph->xAxisName = '用户'; $lang->bug->report->bugsPerSeverity->graph->xAxisName = '严重程度'; $lang->bug->report->bugsPerResolution->graph->xAxisName = '解决方案';