Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task#7736.

Browse Source
This commit is contained in:
leiyong
2020-08-31 16:52:09 +08:00
parent 521cea2844
commit 77d8f2255f
14 changed files with 99 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/zentaopms.php
+19
View File
@@ -109,6 +109,25 @@ $config->hourPointCommonList['vi'][0] = 'giờ';
$config->hourPointCommonList['vi'][1] = 'điểm';
$config->hourPointCommonList['vi'][2] = 'function point';
/* Plan common list. */
$config->planCommonList['zh-cn'][0] = '计划';
$config->planCommonList['zh-cn'][1] = '排期';
$config->planCommonList['zh-tw'][0] = '计划';
$config->planCommonList['zh-tw'][1] = '排期';
$config->planCommonList['en'][0] = 'Plan';
$config->planCommonList['en'][1] = 'Schedule';
$config->planCommonList['de'][0] = 'Plan';
$config->planCommonList['de'][1] = 'Schedule';
$config->planCommonList['fr'][0] = 'Plan';
$config->planCommonList['fr'][1] = 'Schedule';
$config->planCommonList['vi'][0] = 'Plan';
$config->planCommonList['vi'][1] = 'Schedule';
$config->manualUrl['home'] = 'https://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao';
$config->manualUrl['int'] = 'https://www.zentao.pm/book/zentaomanual/zentao-installation-11.html?fullScreen=zentao';
framework/router.class.php
+8 -3
View File
@@ -146,7 +146,7 @@ class router extends baseRouter
}
}
$productCommon = $storyCommon = $hourCommon = 0;
$productCommon = $storyCommon = $hourCommon = $planCommon = 0;
$projectCommon = empty($this->config->isINT) ? 0 : 1;
foreach($commonSettings as $setting)
@@ -166,16 +166,21 @@ class router extends baseRouter
if($this->session->program)
{
$template = $this->dbh->query('SELECT template FROM' . TABLE_PROJECT . "WHERE id = {$this->session->program}")->fetch();
if($template->template == 'waterfall') $projectCommon = 2;
if($template->template == 'waterfall')
{
$projectCommon = 2;
$planCommon = 1;
}
}
$config->storyCommon = $storyCommon;
/* Set productCommon, projectCommon, storyCommon and hourCommon. Default english lang. */
/* Set productCommon, projectCommon, storyCommon, hourCommon and planCommon. Default english lang. */
$lang->productCommon = isset($this->config->productCommonList[$this->clientLang][(int)$productCommon]) ? $this->config->productCommonList[$this->clientLang][(int)$productCommon] : $this->config->productCommonList['en'][(int)$productCommon];
$lang->projectCommon = isset($this->config->projectCommonList[$this->clientLang][(int)$projectCommon]) ? $this->config->projectCommonList[$this->clientLang][(int)$projectCommon] : $this->config->projectCommonList['en'][(int)$projectCommon];
$lang->storyCommon = isset($this->config->storyCommonList[$this->clientLang][(int)$storyCommon]) ? $this->config->storyCommonList[$this->clientLang][(int)$storyCommon] : $this->config->storyCommonList['en'][(int)$storyCommon];
$lang->hourCommon = isset($this->config->hourPointCommonList[$this->clientLang][(int)$hourCommon]) ? $this->config->hourPointCommonList[$this->clientLang][(int)$hourCommon] : $this->config->hourPointCommonList['en'][(int)$hourCommon];
$lang->planCommon = isset($this->config->planCommonList[$this->clientLang][(int)$planCommon]) ? $this->config->planCommonList[$this->clientLang][(int)$planCommon] : $this->config->planCommonList['en'][(int)$planCommon];
if($storyCommon == 0 and isset($URAndSR))
{
module/action/lang/zh-cn.php
+11 -11
View File
@@ -66,7 +66,7 @@ $lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
$lang->action->objectTypes['product'] = $lang->productCommon;
$lang->action->objectTypes['story'] = $lang->storyCommon;
$lang->action->objectTypes['productplan'] = '计划';
$lang->action->objectTypes['productplan'] = $lang->planCommon;
$lang->action->objectTypes['release'] = '发布';
$lang->action->objectTypes['program'] = '项目';
$lang->action->objectTypes['project'] = $lang->projectCommon;
@@ -179,8 +179,8 @@ $lang->action->label->fromlib = '从用例库导入';
$lang->action->label->totask = '转任务';
$lang->action->label->svncommited = '提交代码';
$lang->action->label->gitcommited = '提交代码';
$lang->action->label->linked2plan = '关联计划';
$lang->action->label->unlinkedfromplan = '移除计划';
$lang->action->label->linked2plan = "关联{$lang->planCommon}";
$lang->action->label->unlinkedfromplan = "移除{$lang->planCommon}";
$lang->action->label->changestatus = '修改状态';
$lang->action->label->marked = '编辑了';
$lang->action->label->linked2project = "关联{$lang->projectCommon}";
@@ -246,8 +246,8 @@ $lang->action->dynamicAction->product['deleted'] = '删除' . $lang->p
$lang->action->dynamicAction->product['closed'] = '关闭' . $lang->productCommon;
$lang->action->dynamicAction->product['undeleted'] = '还原' . $lang->productCommon;
$lang->action->dynamicAction->product['hidden'] = '隐藏' . $lang->productCommon;
$lang->action->dynamicAction->productplan['opened'] = '创建计划';
$lang->action->dynamicAction->productplan['edited'] = '编辑计划';
$lang->action->dynamicAction->productplan['opened'] = "创建{$lang->planCommon}";
$lang->action->dynamicAction->productplan['edited'] = "编辑{$lang->planCommon}";
$lang->action->dynamicAction->release['opened'] = '创建发布';
$lang->action->dynamicAction->release['edited'] = '编辑发布';
$lang->action->dynamicAction->release['changestatus'] = '修改发布状态';
@@ -260,8 +260,8 @@ $lang->action->dynamicAction->story['reviewed'] = "评审{$lang->stor
$lang->action->dynamicAction->story['closed'] = "关闭{$lang->storyCommon}";
$lang->action->dynamicAction->story['assigned'] = "指派{$lang->storyCommon}";
$lang->action->dynamicAction->story['changed'] = "变更{$lang->storyCommon}";
$lang->action->dynamicAction->story['linked2plan'] = "{$lang->storyCommon}关联计划";
$lang->action->dynamicAction->story['unlinkedfromplan'] = "计划移除{$lang->storyCommon}";
$lang->action->dynamicAction->story['linked2plan'] = "{$lang->storyCommon}关联{$lang->planCommon}";
$lang->action->dynamicAction->story['unlinkedfromplan'] = "{$lang->planCommon}移除{$lang->storyCommon}";
$lang->action->dynamicAction->story['linked2release'] = "{$lang->storyCommon}关联发布";
$lang->action->dynamicAction->story['unlinkedfromrelease'] = "发布移除{$lang->storyCommon}";
$lang->action->dynamicAction->story['linked2build'] = "{$lang->storyCommon}关联版本";
@@ -326,8 +326,8 @@ $lang->action->dynamicAction->bug['deleted'] = '删除Bug';
$lang->action->dynamicAction->bug['confirmed'] = "确认{$lang->storyCommon}变更";
$lang->action->dynamicAction->bug['tostory'] = "转{$lang->storyCommon}";
$lang->action->dynamicAction->bug['totask'] = '转任务';
$lang->action->dynamicAction->bug['linked2plan'] = 'Bug关联计划';
$lang->action->dynamicAction->bug['unlinkedfromplan'] = '计划移除Bug';
$lang->action->dynamicAction->bug['linked2plan'] = "Bug关联{$lang->planCommon}";
$lang->action->dynamicAction->bug['unlinkedfromplan'] = "{$lang->planCommon}移除Bug";
$lang->action->dynamicAction->bug['linked2release'] = 'Bug关联发布';
$lang->action->dynamicAction->bug['unlinkedfromrelease'] = '发布移除Bug';
$lang->action->dynamicAction->bug['linked2bug'] = 'Bug关联版本';
@@ -384,7 +384,7 @@ $lang->action->dynamicAction->entry['edited'] = '编辑应用';
/* 用来生成相应对象的链接。*/
$lang->action->label->product = $lang->productCommon . '|product|view|productID=%s';
$lang->action->label->productplan = '计划|productplan|view|productID=%s';
$lang->action->label->productplan = "{$lang->planCommon}|productplan|view|productID=%s";
$lang->action->label->release = '发布|release|view|productID=%s';
$lang->action->label->story = "{$lang->storyCommon}|story|view|storyID=%s";
$lang->action->label->program = "项目|program|browse|";
@@ -425,7 +425,7 @@ $lang->action->search->objectTypeList['doclib'] = '文档库';
$lang->action->search->objectTypeList['todo'] = '待办';
$lang->action->search->objectTypeList['build'] = '版本';
$lang->action->search->objectTypeList['release'] = '发布';
$lang->action->search->objectTypeList['productplan'] = '计划';
$lang->action->search->objectTypeList['productplan'] = $lang->planCommon;
$lang->action->search->objectTypeList['branch'] = '分支';
$lang->action->search->objectTypeList['testsuite'] = '套件';
$lang->action->search->objectTypeList['caselib'] = '公共库';
module/block/control.php
+9 -12
View File
@@ -1333,20 +1333,17 @@ class block extends control
*/
public function printScrumdynamicBlock()
{
$projects = $this->loadModel('project')->getPairs();
$products = $this->loadModel('product')->getPairs();
$projects = $this->loadModel('project')->getPairs();
$products = $this->loadModel('product')->getPairs();
$actions = array();
if(!empty($projects) || !empty($products))
{
$actions = $this->dao->select('*')->from(TABLE_ACTION)
->beginIF($projects && $products)->where('project')->in(array_keys($projects))->orWhere('product')->in(array_keys($products))->fi()
->beginIF($projects && empty($products))->where('project')->in(array_keys($projects))->fi()
->beginIF(empty($projects) && $products)->where('product')->in(array_keys($products))->fi()
->orderBy('date_desc')
->limit(10)
->fetchAll();
}
$actions = $this->dao->select('*')->from(TABLE_ACTION)
->where('project')->eq($this->session->program)
->beginIF($projects)->markLeft()->orWhere('project')->in(array_keys($projects))->fi()->markRight()
->beginIF($products)->markLeft()->orWhere('product')->in(array_keys($products))->fi()->markRight()
->orderBy('date_desc')
->limit(10)
->fetchAll();
$this->view->actions = empty($actions) ? array() : $this->loadModel('action')->transformActions($actions);
$this->view->users = $this->loadModel('user')->getPairs('noletter');
module/block/lang/zh-cn.php
+5 -5
View File
@@ -103,7 +103,7 @@ $lang->block->default['waterfall']['program']['2']['block'] = 'waterfallestimat
$lang->block->default['waterfall']['program']['2']['source'] = 'program';
$lang->block->default['waterfall']['program']['2']['grid'] = 4;
$lang->block->default['waterfall']['program']['3']['title'] = '项目计划';
$lang->block->default['waterfall']['program']['3']['title'] = "项目{$lang->planCommon}";
$lang->block->default['waterfall']['program']['3']['block'] = 'waterfallgantt';
$lang->block->default['waterfall']['program']['3']['source'] = 'program';
$lang->block->default['waterfall']['program']['3']['grid'] = 8;
@@ -319,7 +319,7 @@ $lang->block->availableBlocks->case = '我的用例';
$lang->block->availableBlocks->story = "我的{$lang->storyCommon}";
$lang->block->availableBlocks->product = $lang->productCommon . '列表';
$lang->block->availableBlocks->project = $lang->projectCommon . '列表';
$lang->block->availableBlocks->plan = '计划列表';
$lang->block->availableBlocks->plan = "{$lang->planCommon}列表";
$lang->block->availableBlocks->release = '发布列表';
$lang->block->availableBlocks->build = '版本列表';
$lang->block->availableBlocks->testtask = '测试版本列表';
@@ -350,7 +350,7 @@ $lang->block->modules['waterfall']['index'] = new stdclass();
$lang->block->modules['waterfall']['index']->availableBlocks = new stdclass();
$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport = '项目周报';
$lang->block->modules['waterfall']['index']->availableBlocks->waterfallestimate = '估算';
$lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt = '计划甘特图';
$lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt = "项目{$lang->planCommon}";
$lang->block->modules['waterfall']['index']->availableBlocks->waterfallprogress = '到目前为止项目进展趋势图';
$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue = '项目问题';
$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk = '项目风险';
@@ -361,7 +361,7 @@ $lang->block->modules['product']->availableBlocks->statistic = $lang->productCom
$lang->block->modules['product']->availableBlocks->overview = $lang->productCommon . '总览';
$lang->block->modules['product']->availableBlocks->list = $lang->productCommon . '列表';
$lang->block->modules['product']->availableBlocks->story = "{$lang->storyCommon}列表";
$lang->block->modules['product']->availableBlocks->plan = '计划列表';
$lang->block->modules['product']->availableBlocks->plan = "{$lang->storyCommon}列表";
$lang->block->modules['product']->availableBlocks->release = '发布列表';
$lang->block->modules['project'] = new stdclass();
$lang->block->modules['project']->availableBlocks = new stdclass();
@@ -522,7 +522,7 @@ $lang->block->gridOptions[4] = '右侧';
$lang->block->flowchart = array();
$lang->block->flowchart['admin'] = array('管理员', '维护公司', '添加用户', '维护权限');
$lang->block->flowchart['product'] = array($lang->productCommon . '经理', '创建' . $lang->productCommon, '维护模块', '维护计划', "维护{$lang->storyCommon}", '创建发布');
$lang->block->flowchart['product'] = array($lang->productCommon . '经理', '创建' . $lang->productCommon, '维护模块', "维护{$lang->planCommon}", "维护{$lang->storyCommon}", '创建发布');
$lang->block->flowchart['project'] = array($lang->projectCommon . '经理', '创建' . $lang->projectCommon, '维护团队', '关联' . $lang->productCommon, "关联{$lang->storyCommon}", '分解任务');
$lang->block->flowchart['dev'] = array('研发人员', '领取任务和Bug', '更新状态', '完成任务和Bug');
$lang->block->flowchart['tester'] = array('测试人员', '撰写用例', '执行用例', '提交Bug', '验证Bug', '关闭Bug');
module/bug/lang/zh-cn.php
+4 -4
View File
@@ -14,7 +14,7 @@ $lang->bug->common = 'Bug';
$lang->bug->id = 'Bug编号';
$lang->bug->product = '所属' . $lang->productCommon;
$lang->bug->branch = '分支/平台';
$lang->bug->productplan = '所属计划';
$lang->bug->productplan = '所属' . $lang->planCommon;
$lang->bug->module = '所属模块';
$lang->bug->moduleAB = '模块';
$lang->bug->project = '所属' . $lang->projectCommon;
@@ -58,7 +58,7 @@ $lang->bug->resolvedBuild = '解决版本';
$lang->bug->resolvedDate = '解决日期';
$lang->bug->resolvedDateAB = '解决日期';
$lang->bug->deadline = '截止日期';
$lang->bug->plan = '所属计划';
$lang->bug->plan = '所属' . $lang->planCommon;
$lang->bug->closedBy = '由谁关闭';
$lang->bug->closedDate = '关闭日期';
$lang->bug->duplicateBug = '重复ID';
@@ -372,8 +372,8 @@ $lang->bug->action = new stdclass();
$lang->bug->action->resolved = array('main' => '$date, 由 <strong>$actor</strong> 解决，方案为 <strong>$extra</strong> $appendLink。', 'extra' => 'resolutionList');
$lang->bug->action->tostory = array('main' => '$date, 由 <strong>$actor</strong> 转为<strong> ' .$lang->storyCommon. '</strong>，编号为 <strong>$extra</strong>。');
$lang->bug->action->totask = array('main' => '$date, 由 <strong>$actor</strong> 导入为<strong>任务</strong>，编号为 <strong>$extra</strong>。');
$lang->bug->action->linked2plan = array('main' => '$date, 由 <strong>$actor</strong> 关联到计划 <strong>$extra</strong>。');
$lang->bug->action->unlinkedfromplan = array('main' => '$date, 由 <strong>$actor</strong> 从计划 <strong>$extra</strong> 移除。');
$lang->bug->action->linked2plan = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->planCommon . ' <strong>$extra</strong>。');
$lang->bug->action->unlinkedfromplan = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->planCommon . ' <strong>$extra</strong> 移除。');
$lang->bug->action->linked2build = array('main' => '$date, 由 <strong>$actor</strong> 关联到版本 <strong>$extra</strong>。');
$lang->bug->action->unlinkedfrombuild = array('main' => '$date, 由 <strong>$actor</strong> 从版本 <strong>$extra</strong> 移除。');
$lang->bug->action->linked2release = array('main' => '$date, 由 <strong>$actor</strong> 关联到发布 <strong>$extra</strong>。');
module/common/lang/zh-cn.php
+3 -3
View File
@@ -175,7 +175,7 @@ $lang->searchObjects['product'] = $lang->productCommon;
$lang->searchObjects['user'] = '用户';
$lang->searchObjects['build'] = '版本';
$lang->searchObjects['release'] = '发布';
$lang->searchObjects['productplan'] = $lang->productCommon . '计划';
$lang->searchObjects['productplan'] = $lang->productCommon . $lang->planCommon;
$lang->searchObjects['testtask'] = '测试单';
$lang->searchObjects['doc'] = '文档';
$lang->searchObjects['caselib'] = '用例库';
@@ -240,7 +240,7 @@ $lang->product = new stdclass();
$lang->product->menu = new stdclass();
$lang->product->menu->story = array('link' => "{$lang->storyCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->menu->plan = array('link' => '计划|productplan|browse|productID=%s', 'subModule' => 'productplan');
$lang->product->menu->plan = array('link' => "{$lang->planCommon}|productplan|browse|productID=%s", 'subModule' => 'productplan');
$lang->product->menu->release = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release');
$lang->product->menu->roadmap = '路线图|product|roadmap|productID=%s';
$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s";
@@ -866,7 +866,7 @@ $lang->budget->menu = $lang->workestimation->menu;
$lang->programplan->menu->gantt = array('link' => '甘特图|programplan|browse|programID={PROGRAM}&productID={PRODUCT}&type=gantt');
$lang->programplan->menu->lists = array('link' => '阶段列表|programplan|browse|programID={PROGRAM}&productID={PRODUCT}&type=lists', 'alias' => 'create');
$lang->waterfallproduct->menu->plan = array('link' => '排期|productplan|browse|productID={PRODUCT}', 'subModule' => 'productplan');
$lang->waterfallproduct->menu->plan = array('link' => "{$lang->planCommon}|productplan|browse|productID={PRODUCT}", 'subModule' => 'productplan');
$lang->waterfallproduct->menu->requirement = '用户需求|product|browse|product={PRODUCT}&branch=&browseType=unclosed&queryID=0&storyType=requirement';
$lang->waterfallproduct->menu->story = '软件需求|product|browse|product={PRODUCT}&branch=&browseType=unclosed&queryID=0&storyType=story';
$lang->waterfallproduct->menu->track = '跟踪矩阵|story|track|product={PRODUCT}';
module/issue/model.php
-26
View File
@@ -153,32 +153,6 @@ class issueModel extends model
return $this->dao->select('id,name')->from(TABLE_ACTIVITY)->where('deleted')->eq('0')->orderBy('id_desc')->fetchPairs();
}
/**
* Create an issue.
*
* @access public
* @return bool
*/
public function create()
{
$now = helper::now();
$data = fixer::input('post')
->add('createdBy', $this->app->user->account)
->add('createdDate', $now)
->add('program', $this->session->program)
->remove('labels,files')
->addIF($this->post->assignedTo, 'assignedBy', $this->app->user->account)
->addIF($this->post->assignedTo, 'assignedDate', $now)
->stripTags($this->config->issue->editor->create['id'], $this->config->allowedTags)
->get();
$this->dao->insert(TABLE_ISSUE)->data($data)->batchCheck($this->config->issue->create->requiredFields, 'notempty')->exec();
$issueID = $this->dao->lastInsertID();
$this->loadModel('file')->saveUpload('issue', $issueID);
return $issueID;
}
/**
* Update an issue.
*
module/product/lang/zh-cn.php
+3 -3
View File
@@ -34,7 +34,7 @@ $lang->product->exportAction = "导出{$lang->productCommon}";
$lang->product->basicInfo = '基本信息';
$lang->product->otherInfo = '其他信息';
$lang->product->plans = '计划数';
$lang->product->plans = "{$lang->planCommon}数";
$lang->product->releases = '发布数';
$lang->product->docs = '文档数';
$lang->product->bugs = '相关Bug';
@@ -87,7 +87,7 @@ $lang->product->release = '发布';
$lang->product->allRelease = '所有发布';
$lang->product->maintain = '维护中';
$lang->product->latestDynamic = '最新动态';
$lang->product->plan = '计划';
$lang->product->plan = $lang->planCommon;
$lang->product->iteration = '版本迭代';
$lang->product->iterationInfo = '迭代 %s 次';
$lang->product->iterationView = '查看详情';
@@ -105,7 +105,7 @@ $lang->product->changedStory = '已变更';
$lang->product->willClose = '待关闭';
$lang->product->closedStory = '已关闭';
$lang->product->unclosed = '未关闭';
$lang->product->unplan = '未计划';
$lang->product->unplan = "未{$lang->planCommon}";
$lang->product->viewByUser = '按用户查看';
$lang->product->allStory = '所有';
module/productplan/lang/zh-cn.php
+16 -16
View File
@@ -9,13 +9,13 @@
* @version $Id: zh-cn.php 4659 2013-04-17 06:45:08Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->productplan->common = $lang->productCommon . '计划';
$lang->productplan->browse = "浏览计划";
$lang->productplan->index = "计划列表";
$lang->productplan->create = "创建计划";
$lang->productplan->edit = "编辑计划";
$lang->productplan->delete = "删除计划";
$lang->productplan->view = "计划详情";
$lang->productplan->common = $lang->productCommon . $lang->planCommon;
$lang->productplan->browse = "浏览{$lang->planCommon}";
$lang->productplan->index = "{$lang->planCommon}列表";
$lang->productplan->create = "创建{$lang->planCommon}";
$lang->productplan->edit = "编辑{$lang->planCommon}";
$lang->productplan->delete = "删除{$lang->planCommon}";
$lang->productplan->view = "{$lang->planCommon}详情";
$lang->productplan->bugSummary = "本页共 <strong>%s</strong> 个Bug";
$lang->productplan->basicInfo = '基本信息';
$lang->productplan->batchEdit = '批量编辑';
@@ -28,21 +28,21 @@ $lang->productplan->batchUnlinkStory = "批量移除{$lang->storyCommon}";
$lang->productplan->linkedStories = $lang->storyCommon;
$lang->productplan->unlinkedStories = "未关联{$lang->storyCommon}";
$lang->productplan->updateOrder = '排序';
$lang->productplan->createChildren = "创建子计划";
$lang->productplan->createChildren = "创建子{$lang->planCommon}";
$lang->productplan->linkBug = "关联Bug";
$lang->productplan->unlinkBug = "移除Bug";
$lang->productplan->batchUnlinkBug = "批量移除Bug";
$lang->productplan->linkedBugs = 'Bug';
$lang->productplan->unlinkedBugs = '未关联Bug';
$lang->productplan->unexpired = '未过期计划';
$lang->productplan->all = '所有计划';
$lang->productplan->unexpired = "未过期{$lang->planCommon}";
$lang->productplan->all = "所有{$lang->planCommon}";
$lang->productplan->confirmDelete = "您确认删除该计划吗？";
$lang->productplan->confirmDelete = "您确认删除该{$lang->planCommon}吗？";
$lang->productplan->confirmUnlinkStory = "您确认移除该{$lang->storyCommon}吗？";
$lang->productplan->confirmUnlinkBug = "您确认移除该Bug吗？";
$lang->productplan->noPlan = '暂时没有计划。';
$lang->productplan->cannotDeleteParent = '不能删除父计划';
$lang->productplan->noPlan = "暂时没有{$lang->planCommon}。";
$lang->productplan->cannotDeleteParent = "不能删除父{$lang->planCommon}";
$lang->productplan->id = '编号';
$lang->productplan->product = $lang->productCommon;
@@ -51,15 +51,15 @@ $lang->productplan->title = '名称';
$lang->productplan->desc = '描述';
$lang->productplan->begin = '开始日期';
$lang->productplan->end = '结束日期';
$lang->productplan->last = '上次计划';
$lang->productplan->last = "上次{$lang->planCommon}";
$lang->productplan->future = '待定';
$lang->productplan->stories = "{$lang->storyCommon}数";
$lang->productplan->bugs = 'Bug数';
$lang->productplan->hour = $lang->hourCommon;
$lang->productplan->project = $lang->projectCommon;
$lang->productplan->parent = "父计划";
$lang->productplan->parent = "父{$lang->planCommon}";
$lang->productplan->parentAB = "父";
$lang->productplan->children = "子计划";
$lang->productplan->children = "子{$lang->planCommon}";
$lang->productplan->childrenAB = "子";
$lang->productplan->order = "排序";
$lang->productplan->deleted = "已删除";
module/project/lang/zh-cn.php
+6 -6
View File
@@ -120,7 +120,7 @@ $lang->project->aclList['custom'] = "自定义白名单(团队成员和白名
$lang->project->storyPoint = '故事点';
$lang->project->burnByList['left'] = '按剩余工时查看';
$lang->project->burnByList['estimate'] = '按计划工时查看';
$lang->project->burnByList['estimate'] = "按{$lang->planCommon}工时查看";
$lang->project->burnByList['storyPoint'] = '按故事点查看';
/* 方法列表。*/
@@ -142,8 +142,8 @@ $lang->project->doc = '文档列表';
$lang->project->doclib = '文档库列表';
$lang->project->manageProducts = '关联' . $lang->productCommon;
$lang->project->linkStory = "关联{$lang->storyCommon}";
$lang->project->linkStoryByPlan = '按照计划关联';
$lang->project->linkPlan = '关联计划';
$lang->project->linkStoryByPlan = "按照{$lang->planCommon}关联";
$lang->project->linkPlan = "关联{$lang->planCommon}";
$lang->project->unlinkStoryTasks = "未关联{$lang->storyCommon}任务";
$lang->project->linkedProducts = '已关联';
$lang->project->unlinkedProducts = '未关联';
@@ -172,7 +172,7 @@ $lang->project->unlinkStory = "移除{$lang->storyCommon}";
$lang->project->unlinkStoryAB = "移除{$lang->storyCommon}";
$lang->project->batchUnlinkStory = "批量移除{$lang->storyCommon}";
$lang->project->importTask = '转入任务';
$lang->project->importPlanStories = "按计划关联{$lang->storyCommon}";
$lang->project->importPlanStories = "按{$lang->planCommon}关联{$lang->storyCommon}";
$lang->project->importBug = '导入Bug';
$lang->project->updateOrder = "{$lang->projectCommon}排序";
$lang->project->tree = '树状图';
@@ -182,7 +182,7 @@ $lang->project->treeOnlyTask = '树状图只看任务';
$lang->project->treeOnlyStory = "树状图只看{$lang->storyCommon}";
$lang->project->storyKanban = "{$lang->storyCommon}看板";
$lang->project->storySort = "{$lang->storyCommon}排序";
$lang->project->importPlanStory = '创建' . $lang->projectCommon . '成功！\n是否导入计划关联的相关' . $lang->storyCommon . '？';
$lang->project->importPlanStory = '创建' . $lang->projectCommon . '成功！\n是否导入' . $lang->planCommon . '关联的相关' . $lang->storyCommon . '？';
$lang->project->iteration = '版本迭代';
$lang->project->iterationInfo = '迭代%s次';
$lang->project->viewAll = '查看所有';
@@ -225,7 +225,7 @@ $lang->project->aboveAllProduct = "以上所有{$lang->productCommon}";
$lang->project->aboveAllProject = "以上所有{$lang->projectCommon}";
/* 页面提示。*/
$lang->project->linkStoryByPlanTips = "此操作会将所选计划下面的{$lang->storyCommon}全部关联到此{$lang->projectCommon}中";
$lang->project->linkStoryByPlanTips = "此操作会将所选{$lang->planCommon}下面的{$lang->storyCommon}全部关联到此{$lang->projectCommon}中";
$lang->project->selectProject = "请选择{$lang->projectCommon}";
$lang->project->beginAndEnd = '起止时间';
$lang->project->begin = '开始日期';
module/report/lang/zh-cn.php
+4 -4
View File
@@ -71,7 +71,7 @@ $lang->report->taskTotal = "总任务数";
$lang->report->manhourTotal = "总工时";
$lang->report->validRate = "有效率";
$lang->report->validRateTips = "方案为已解决或延期/状态为已解决或已关闭";
$lang->report->unplanned = '未计划';
$lang->report->unplanned = "未{$lang->planCommon}";
$lang->report->workday = '每天工时';
$lang->report->diffDays = '工作日天数';
@@ -82,7 +82,7 @@ $lang->report->typeList['line'] = '折线图';
$lang->report->conditions = '筛选条件：';
$lang->report->closedProduct = '关闭' . $lang->productCommon;
$lang->report->overduePlan = '过期计划';
$lang->report->overduePlan = "过期{$lang->planCommon}";
/* daily reminder. */
$lang->report->idAB = 'ID';
@@ -112,7 +112,7 @@ $lang->report->annualData->consumed = "累计工时数";
$lang->report->annualData->foundBugs = "累计创建Bug数";
$lang->report->annualData->createdCases = "累计创建用例数";
$lang->report->annualData->involvedProducts = "累计参与{$lang->productCommon}数";
$lang->report->annualData->createdPlans = "累计创建计划数";
$lang->report->annualData->createdPlans = "累计创建{$lang->planCommon}数";
$lang->report->annualData->createdStories = "累计创建{$lang->storyCommon}数";
$lang->report->annualData->productOverview = "{$lang->productCommon}创建{$lang->storyCommon}数及占比";
@@ -128,7 +128,7 @@ $lang->report->annualData->finishedTask = '完成任务数';
$lang->report->annualData->foundBug = '创建Bug数';
$lang->report->annualData->resolvedBug = '解决Bug数';
$lang->report->annualData->productName = "{$lang->productCommon}名称";
$lang->report->annualData->planCount = '计划数';
$lang->report->annualData->planCount = "{$lang->planCommon}数";
$lang->report->annualData->storyCount = "{$lang->storyCommon}数";
$lang->report->annualData->qaData = "累计创建Bug数和创建用例数";
module/score/lang/zh-cn.php
+2 -2
View File
@@ -36,7 +36,7 @@ $lang->score->modules['testcase'] = '用例';
$lang->score->modules['testtask'] = '测试单';
$lang->score->modules['build'] = 'Build';
$lang->score->modules['project'] = '项目';
$lang->score->modules['productplan'] = '计划';
$lang->score->modules['productplan'] = $lang->planCommon;
$lang->score->modules['release'] = '发布';
$lang->score->modules['block'] = '区块';
$lang->score->modules['search'] = '搜索';
@@ -74,7 +74,7 @@ $lang->score->methods['testcase']['create'] = '创建用例';
$lang->score->methods['build']['create'] = '创建版本';
$lang->score->methods['project']['create'] = '创建项目';
$lang->score->methods['project']['close'] = '项目完成';
$lang->score->methods['productplan']['create'] = '创建计划';
$lang->score->methods['productplan']['create'] = "创建{$lang->planCommon}";
$lang->score->methods['release']['create'] = '创建发布';
$lang->score->methods['block']['set'] = '区块自定义设置';
$lang->score->methods['search']['saveQuery'] = '保存搜索条件';
module/story/lang/zh-cn.php
+9 -9
View File
@@ -59,7 +59,7 @@ $lang->story->zeroTask = "只列零任务{$lang->storyCommon}";
$lang->story->reportChart = "统计报表";
$lang->story->reportAction = "统计报表";
$lang->story->copyTitle = "同{$lang->storyCommon}名称";
$lang->story->batchChangePlan = "批量修改计划";
$lang->story->batchChangePlan = "批量修改{$lang->planCommon}";
$lang->story->batchChangeBranch = "批量修改分支";
$lang->story->batchChangeStage = "批量修改阶段";
$lang->story->batchAssignTo = "批量指派";
@@ -109,8 +109,8 @@ $lang->story->rejectedReason = '拒绝原因';
$lang->story->reviewedBy = '由谁评审';
$lang->story->reviewedDate = '评审时间';
$lang->story->version = '版本号';
$lang->story->plan = '所属计划';
$lang->story->planAB = '计划';
$lang->story->plan = "所属{$lang->planCommon}";
$lang->story->planAB = $lang->planCommon;
$lang->story->comment = '备注';
$lang->story->children = "子{$lang->storyCommon}";
$lang->story->childrenAB = "子";
@@ -153,7 +153,7 @@ $lang->story->statusList['changed'] = '已变更';
$lang->story->stageList[''] = '';
$lang->story->stageList['wait'] = '未开始';
$lang->story->stageList['planned'] = '已计划';
$lang->story->stageList['planned'] = "已{$lang->planCommon}";
$lang->story->stageList['projected'] = '已立项';
$lang->story->stageList['developing'] = '研发中';
$lang->story->stageList['developed'] = '研发完毕';
@@ -252,8 +252,8 @@ $lang->story->form->file = "附件，如果该{$lang->storyCommon}有相关
$lang->story->action = new stdclass();
$lang->story->action->reviewed = array('main' => '$date, 由 <strong>$actor</strong> 记录评审结果，结果为 <strong>$extra</strong>。', 'extra' => 'reviewResultList');
$lang->story->action->closed = array('main' => '$date, 由 <strong>$actor</strong> 关闭，原因为 <strong>$extra</strong> $appendLink。', 'extra' => 'reasonList');
$lang->story->action->linked2plan = array('main' => '$date, 由 <strong>$actor</strong> 关联到计划 <strong>$extra</strong>。');
$lang->story->action->unlinkedfromplan = array('main' => '$date, 由 <strong>$actor</strong> 从计划 <strong>$extra</strong> 移除。');
$lang->story->action->linked2plan = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->planCommon . ' <strong>$extra</strong>。');
$lang->story->action->unlinkedfromplan = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->planCommon . ' <strong>$extra</strong> 移除。');
$lang->story->action->linked2project = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->projectCommon . ' <strong>$extra</strong>。');
$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->projectCommon . ' <strong>$extra</strong> 移除。');
$lang->story->action->linked2build = array('main' => '$date, 由 <strong>$actor</strong> 关联到版本 <strong>$extra</strong>。');
@@ -275,7 +275,7 @@ $lang->story->report->value = "{$lang->storyCommon}数";
$lang->story->report->charts['storysPerProduct'] = $lang->productCommon . "{$lang->storyCommon}数量";
$lang->story->report->charts['storysPerModule'] = "模块{$lang->storyCommon}数量";
$lang->story->report->charts['storysPerSource'] = "按{$lang->storyCommon}来源统计";
$lang->story->report->charts['storysPerPlan'] = '按计划进行统计';
$lang->story->report->charts['storysPerPlan'] = "按{$lang->planCommon}进行统计";
$lang->story->report->charts['storysPerStatus'] = '按状态进行统计';
$lang->story->report->charts['storysPerStage'] = '按所处阶段进行统计';
$lang->story->report->charts['storysPerPri'] = '按优先级进行统计';
@@ -307,7 +307,7 @@ $lang->story->report->storysPerChange = new stdclass();
$lang->story->report->storysPerProduct->item = $lang->productCommon;
$lang->story->report->storysPerModule->item = '模块';
$lang->story->report->storysPerSource->item = '来源';
$lang->story->report->storysPerPlan->item = '计划';
$lang->story->report->storysPerPlan->item = $lang->planCommon;
$lang->story->report->storysPerStatus->item = '状态';
$lang->story->report->storysPerStage->item = '阶段';
$lang->story->report->storysPerPri->item = '优先级';
@@ -333,7 +333,7 @@ $lang->story->report->storysPerChange->graph = new stdclass();
$lang->story->report->storysPerProduct->graph->xAxisName = $lang->productCommon;
$lang->story->report->storysPerModule->graph->xAxisName = '模块';
$lang->story->report->storysPerSource->graph->xAxisName = '来源';
$lang->story->report->storysPerPlan->graph->xAxisName = '计划';
$lang->story->report->storysPerPlan->graph->xAxisName = $lang->planCommon;
$lang->story->report->storysPerStatus->graph->xAxisName = '状态';
$lang->story->report->storysPerStage->graph->xAxisName = '所处阶段';
$lang->story->report->storysPerPri->graph->xAxisName = '优先级';