From 55ca035860d400e906f396f81c8b70b2e81fa44b Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 28 Apr 2016 17:29:44 +0800 Subject: [PATCH] * add more block for ranzhi. --- module/block/control.php | 1 + module/block/lang/en.php | 30 +++++++++++++++++------------- module/block/lang/zh-cn.php | 18 +++++++++++------- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/module/block/control.php b/module/block/control.php index b642ea21ab..0f54cd5fb0 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -332,6 +332,7 @@ class block extends control $this->app->user = new stdclass(); $this->app->user->account = 'guest'; } + $this->app->user->rights = $this->loadModel('user')->authorize($this->app->user->account); $sso = base64_decode($this->get->sso); $this->view->sso = $sso; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 508a26ac0c..5c7fb617aa 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -129,31 +129,35 @@ $lang->block->availableBlocks->case = 'My case'; $lang->block->availableBlocks->story = 'My story'; $lang->block->availableBlocks->product = $lang->productCommon; $lang->block->availableBlocks->project = $lang->projectCommon; +$lang->block->availableBlocks->plan = 'Plan list'; +$lang->block->availableBlocks->release = 'Release list'; +$lang->block->availableBlocks->build = 'Build list'; +$lang->block->availableBlocks->testtask = 'Test build list'; $lang->block->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; -$lang->block->moduleList['qa'] = '测试'; -$lang->block->moduleList['todo'] = '待办'; +$lang->block->moduleList['qa'] = 'Test'; +$lang->block->moduleList['todo'] = 'Todo'; $lang->block->modules['product'] = new stdclass(); $lang->block->modules['product']->availableBlocks = new stdclass(); -$lang->block->modules['product']->availableBlocks->list = $lang->productCommon . '列表'; -$lang->block->modules['product']->availableBlocks->story = '需求列表'; -$lang->block->modules['product']->availableBlocks->plan = '计划列表'; -$lang->block->modules['product']->availableBlocks->release = '发布列表'; +$lang->block->modules['product']->availableBlocks->list = $lang->productCommon . ' list'; +$lang->block->modules['product']->availableBlocks->story = 'Story list'; +$lang->block->modules['product']->availableBlocks->plan = 'Plan list'; +$lang->block->modules['product']->availableBlocks->release = 'Release list'; $lang->block->modules['project'] = new stdclass(); $lang->block->modules['project']->availableBlocks = new stdclass(); -$lang->block->modules['project']->availableBlocks->list = $lang->projectCommon . '列表'; -$lang->block->modules['project']->availableBlocks->task = '任务列表'; -$lang->block->modules['project']->availableBlocks->build = '版本列表'; +$lang->block->modules['project']->availableBlocks->list = $lang->projectCommon . ' list'; +$lang->block->modules['project']->availableBlocks->task = 'Task list'; +$lang->block->modules['project']->availableBlocks->build = 'Build list'; $lang->block->modules['qa'] = new stdclass(); $lang->block->modules['qa']->availableBlocks = new stdclass(); -$lang->block->modules['qa']->availableBlocks->bug = 'Bug列表'; -$lang->block->modules['qa']->availableBlocks->case = '用例列表'; -$lang->block->modules['qa']->availableBlocks->testtask = '版本列表'; +$lang->block->modules['qa']->availableBlocks->bug = 'Bug list'; +$lang->block->modules['qa']->availableBlocks->case = 'Case list'; +$lang->block->modules['qa']->availableBlocks->testtask = 'Test build list'; $lang->block->modules['todo'] = new stdclass(); $lang->block->modules['todo']->availableBlocks = new stdclass(); -$lang->block->modules['todo']->availableBlocks->list = '待办列表'; +$lang->block->modules['todo']->availableBlocks->list = 'Todo list'; $lang->block->orderByList = new stdclass(); diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 5600683da0..3c702230ef 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -122,13 +122,17 @@ $lang->block->orderBy = '排序'; $lang->block->availableBlocks = new stdclass(); -$lang->block->availableBlocks->todo = '我的待办'; -$lang->block->availableBlocks->task = '我的任务'; -$lang->block->availableBlocks->bug = '我的Bug'; -$lang->block->availableBlocks->case = '我的用例'; -$lang->block->availableBlocks->story = '我的需求'; -$lang->block->availableBlocks->product = $lang->productCommon . '列表'; -$lang->block->availableBlocks->project = $lang->projectCommon . '列表'; +$lang->block->availableBlocks->todo = '我的待办'; +$lang->block->availableBlocks->task = '我的任务'; +$lang->block->availableBlocks->bug = '我的Bug'; +$lang->block->availableBlocks->case = '我的用例'; +$lang->block->availableBlocks->story = '我的需求'; +$lang->block->availableBlocks->product = $lang->productCommon . '列表'; +$lang->block->availableBlocks->project = $lang->projectCommon . '列表'; +$lang->block->availableBlocks->plan = '计划列表'; +$lang->block->availableBlocks->release = '发布列表'; +$lang->block->availableBlocks->build = '版本列表'; +$lang->block->availableBlocks->testtask = '测试版本列表'; $lang->block->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon;