diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index c2b3c26392..8a8a12e95e 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -68,7 +68,7 @@ $lang->action->objectTypes['product'] = $lang->productCommon; $lang->action->objectTypes['branch'] = '分支'; $lang->action->objectTypes['story'] = $lang->productSRCommon; $lang->action->objectTypes['design'] = '设计'; -$lang->action->objectTypes['productplan'] = $lang->planCommon; +$lang->action->objectTypes['productplan'] = '计划'; $lang->action->objectTypes['release'] = '发布'; $lang->action->objectTypes['program'] = '项目集'; $lang->action->objectTypes['project'] = '项目'; @@ -191,8 +191,8 @@ $lang->action->label->fromlib = '从用例库导入'; $lang->action->label->totask = '转任务'; $lang->action->label->svncommited = '提交代码'; $lang->action->label->gitcommited = '提交代码'; -$lang->action->label->linked2plan = "关联{$lang->planCommon}"; -$lang->action->label->unlinkedfromplan = "移除{$lang->planCommon}"; +$lang->action->label->linked2plan = "关联计划"; +$lang->action->label->unlinkedfromplan = "移除计划"; $lang->action->label->changestatus = '修改状态'; $lang->action->label->marked = '编辑了'; $lang->action->label->linked2project = "关联{$lang->projectCommon}"; @@ -270,8 +270,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->planCommon}"; -$lang->action->dynamicAction->productplan['edited'] = "编辑{$lang->planCommon}"; +$lang->action->dynamicAction->productplan['opened'] = "创建计划"; +$lang->action->dynamicAction->productplan['edited'] = "编辑计划"; $lang->action->dynamicAction->release['opened'] = '创建发布'; $lang->action->dynamicAction->release['edited'] = '编辑发布'; $lang->action->dynamicAction->release['changestatus'] = '修改发布状态'; @@ -284,8 +284,8 @@ $lang->action->dynamicAction->story['reviewed'] = "评审{$lang->prod $lang->action->dynamicAction->story['closed'] = "关闭{$lang->productSRCommon}"; $lang->action->dynamicAction->story['assigned'] = "指派{$lang->productSRCommon}"; $lang->action->dynamicAction->story['changed'] = "变更{$lang->productSRCommon}"; -$lang->action->dynamicAction->story['linked2plan'] = "{$lang->productSRCommon}关联{$lang->planCommon}"; -$lang->action->dynamicAction->story['unlinkedfromplan'] = "{$lang->planCommon}移除{$lang->productSRCommon}"; +$lang->action->dynamicAction->story['linked2plan'] = "{$lang->productSRCommon}关联计划"; +$lang->action->dynamicAction->story['unlinkedfromplan'] = "计划移除{$lang->productSRCommon}"; $lang->action->dynamicAction->story['linked2release'] = "{$lang->productSRCommon}关联发布"; $lang->action->dynamicAction->story['unlinkedfromrelease'] = "发布移除{$lang->productSRCommon}"; $lang->action->dynamicAction->story['linked2build'] = "{$lang->productSRCommon}关联版本"; @@ -350,8 +350,8 @@ $lang->action->dynamicAction->bug['deleted'] = '删除Bug'; $lang->action->dynamicAction->bug['confirmed'] = "确认{$lang->productSRCommon}变更"; $lang->action->dynamicAction->bug['tostory'] = "转{$lang->productSRCommon}"; $lang->action->dynamicAction->bug['totask'] = '转任务'; -$lang->action->dynamicAction->bug['linked2plan'] = "Bug关联{$lang->planCommon}"; -$lang->action->dynamicAction->bug['unlinkedfromplan'] = "{$lang->planCommon}移除Bug"; +$lang->action->dynamicAction->bug['linked2plan'] = "Bug关联计划"; +$lang->action->dynamicAction->bug['unlinkedfromplan'] = "计划移除Bug"; $lang->action->dynamicAction->bug['linked2release'] = 'Bug关联发布'; $lang->action->dynamicAction->bug['unlinkedfromrelease'] = '发布移除Bug'; $lang->action->dynamicAction->bug['linked2bug'] = 'Bug关联版本'; @@ -408,7 +408,7 @@ $lang->action->dynamicAction->entry['edited'] = '编辑应用'; /* 用来生成相应对象的链接。*/ $lang->action->label->product = $lang->productCommon . '|product|view|productID=%s'; -$lang->action->label->productplan = "{$lang->planCommon}|productplan|view|productID=%s"; +$lang->action->label->productplan = "计划|productplan|view|productID=%s"; $lang->action->label->release = '发布|release|view|productID=%s'; $lang->action->label->story = "{$lang->productSRCommon}|story|view|storyID=%s"; $lang->action->label->program = "项目集|program|pgmproduct|programID=%s"; @@ -453,7 +453,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->planCommon; +$lang->action->search->objectTypeList['productplan'] = '计划'; $lang->action->search->objectTypeList['branch'] = '分支'; $lang->action->search->objectTypeList['testsuite'] = '套件'; $lang->action->search->objectTypeList['caselib'] = '公共库'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index a397e11ab8..1b098f08f9 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -14,7 +14,7 @@ $lang->bug->common = 'Bug'; $lang->bug->id = 'Bug编号'; $lang->bug->product = '所属' . $lang->productCommon; $lang->bug->branch = '分支/平台'; -$lang->bug->productplan = '所属' . $lang->planCommon; +$lang->bug->productplan = '所属' . '计划'; $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->planCommon; +$lang->bug->plan = '所属' . '计划'; $lang->bug->closedBy = '由谁关闭'; $lang->bug->closedDate = '关闭日期'; $lang->bug->duplicateBug = '重复ID'; @@ -373,8 +373,8 @@ $lang->bug->action = new stdclass(); $lang->bug->action->resolved = array('main' => '$date, 由 $actor 解决，方案为 $extra $appendLink。', 'extra' => 'resolutionList'); $lang->bug->action->tostory = array('main' => '$date, 由 $actor 转为 ' . $lang->projectSRCommon . '，编号为 $extra。'); $lang->bug->action->totask = array('main' => '$date, 由 $actor 导入为任务，编号为 $extra。'); -$lang->bug->action->linked2plan = array('main' => '$date, 由 $actor 关联到' . $lang->planCommon . ' $extra。'); -$lang->bug->action->unlinkedfromplan = array('main' => '$date, 由 $actor 从' . $lang->planCommon . ' $extra 移除。'); +$lang->bug->action->linked2plan = array('main' => '$date, 由 $actor 关联到计划 $extra。'); +$lang->bug->action->unlinkedfromplan = array('main' => '$date, 由 $actor 从计划 $extra 移除。'); $lang->bug->action->linked2build = array('main' => '$date, 由 $actor 关联到版本 $extra。'); $lang->bug->action->unlinkedfrombuild = array('main' => '$date, 由 $actor 从版本 $extra 移除。'); $lang->bug->action->linked2release = array('main' => '$date, 由 $actor 关联到发布 $extra。'); diff --git a/module/custom/control.php b/module/custom/control.php index 81c35b3ade..dc396613ec 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -441,6 +441,35 @@ class custom extends control $this->display(); } + /** + * Edit story concept. + * + * @access public + * @return void + */ + public function editStoryConcept($key = 0) + { + if($_POST) + { + $result = $this->custom->updateURAndSR($key); + if(!$result) $this->send(array('result' => 'fail', 'message' => $this->lang->custom->notice->URSREmpty)); + + if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); + $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent')); + } + + $lang = $this->app->getClientLang(); + $URSR = $this->dao->select('`value`')->from(TABLE_LANG) + ->where('lang')->eq($lang) + ->andWhere('module')->eq('custom') + ->andWhere('section')->eq('URSRList') + ->andWhere('`key`')->eq($key) + ->fetch('value'); + + $this->view->URSR = json_decode($URSR); + $this->display(); + } + /** * Delete story concept. * diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index e38b1c8f6c..f49f2487d0 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -40,6 +40,7 @@ $lang->custom->scrumStory = "故事"; $lang->custom->waterfallCommon = "瀑布"; $lang->custom->buildin = "系统内置"; $lang->custom->isDefault = '是否默认'; +$lang->custom->editStoryConcept = "编辑需求概念"; $lang->custom->setStoryConcept = "设置需求概念"; $lang->custom->setDefaultConcept = "设置默认概念"; $lang->custom->browseStoryConcept = "需求概念列表"; diff --git a/module/custom/model.php b/module/custom/model.php index 1566c4e82d..bd2267cfde 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -482,7 +482,7 @@ class customModel extends model foreach($this->lang->custom->URSRList as $key => $content) { $content = json_decode($content); - $URSRPairs[$key] = $content->SRName . '/' . $content->URName; + $URSRPairs[$key] = $content->URName . '/' . $content->SRName; } return $URSRPairs; @@ -614,7 +614,7 @@ class customModel extends model } /** - * Set ur and SR concept. + * Set UR and SR concept. * * @access public * @return bool @@ -650,6 +650,35 @@ class customModel extends model return true; } + /** + * Edit UR and SR concept. + * + * @param int $key + * @access public + * @return bool + */ + public function updateURAndSR($key = 0) + { + $lang = $this->app->getClientLang(); + $data = fixer::input('post')->get(); + + if(!$data->SRName || !$data->URName) return false; + + $URSRList = new stdclass(); + $URSRList->SRName = $data->SRName; + $URSRList->URName = $data->URName; + + $value = json_encode($URSRList); + $this->dao->update(TABLE_LANG)->set('value')->eq($value) + ->where('`key`')->eq($key) + ->andWhere('section')->eq('URSRList') + ->andWhere('lang')->eq($lang) + ->andWhere('module')->eq('custom') + ->exec(); + + return true; + } + /** * Set story or requirement. * diff --git a/module/custom/view/browsestoryconcept.html.php b/module/custom/view/browsestoryconcept.html.php index 0fdc4f766a..acf7922644 100644 --- a/module/custom/view/browsestoryconcept.html.php +++ b/module/custom/view/browsestoryconcept.html.php @@ -15,7 +15,7 @@
@@ -36,7 +36,8 @@ custom->URSRCommon) echo "";?> - createLink('custom', 'setDefaultConcept', "id=$key"), "", 'hiddenwin', "class='btn' title={$lang->custom->setDefaultConcept}");?> + createLink('custom', 'setDefaultConcept', "id=$key"), "", 'hiddenwin', "class='btn' title={$lang->custom->setDefaultConcept}");?> + createLink('custom', 'editStoryConcept', "id=$key", '', true), "", '', "class='btn iframe' title={$lang->edit}");?> createLink('custom', 'deleteStoryConcept', "id=$key"), "", 'hiddenwin', "class='btn' $disabled title={$lang->delete}");?> diff --git a/module/custom/view/editstoryconcept.html.php b/module/custom/view/editstoryconcept.html.php new file mode 100644 index 0000000000..c40d4397bf --- /dev/null +++ b/module/custom/view/editstoryconcept.html.php @@ -0,0 +1,34 @@ + + * @package ZenTaoPMS + * @version $Id: setstoryconcept.html.php 4129 2020-09-01 01:58:14Z sgm $ + */ +?> + +
+
+
+ + + + + + + + + + + + +
custom->URConcept;?> + custom->SRConcept;?> +
URName, "class='form-control'");?>SRName, "class='form-control'");?>
+
+
+
+ diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index e443c065c7..aa999809e6 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1155,6 +1155,7 @@ $lang->resource->custom->setPublic = 'setPublic'; $lang->resource->custom->timezone = 'timezone'; $lang->resource->custom->estimate = 'estimate'; $lang->resource->custom->setStoryConcept = 'setStoryConcept'; +$lang->resource->custom->editStoryConcept = 'editStoryConcept'; $lang->resource->custom->browseStoryConcept = 'browseStoryConcept'; $lang->resource->custom->deleteStoryConcept = 'deleteStoryConcept'; $lang->resource->custom->configureScrum = 'configureScrum'; @@ -1170,9 +1171,10 @@ $lang->custom->methodOrder[40] = 'setPublic'; $lang->custom->methodOrder[45] = 'timezone'; $lang->custom->methodOrder[50] = 'estimate'; $lang->custom->methodOrder[55] = 'setStoryContcept'; -$lang->custom->methodOrder[60] = 'browseStoryContcept'; -$lang->custom->methodOrder[65] = 'deleteStoryContcept'; -$lang->custom->methodOrder[70] = 'configureScrum'; +$lang->custom->methodOrder[60] = 'editStoryContcept'; +$lang->custom->methodOrder[65] = 'browseStoryContcept'; +$lang->custom->methodOrder[70] = 'deleteStoryContcept'; +$lang->custom->methodOrder[75] = 'configureScrum'; $lang->resource->datatable = new stdclass(); $lang->resource->datatable->setGlobal = 'setGlobal'; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 306a152c66..131ffe3678 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -34,7 +34,7 @@ $lang->product->exportAction = "导出{$lang->productCommon}"; $lang->product->basicInfo = '基本信息'; $lang->product->otherInfo = '其他信息'; -$lang->product->plans = "{$lang->planCommon}数"; +$lang->product->plans = "计划数"; $lang->product->releases = '发布数'; $lang->product->docs = '文档数'; $lang->product->bugs = '相关Bug'; @@ -90,7 +90,7 @@ $lang->product->release = '发布'; $lang->product->allRelease = '所有发布'; $lang->product->maintain = '维护中'; $lang->product->latestDynamic = '最新动态'; -$lang->product->plan = $lang->planCommon; +$lang->product->plan = '计划'; $lang->product->iteration = '版本迭代'; $lang->product->iterationInfo = '迭代 %s 次'; $lang->product->iterationView = '查看详情'; @@ -109,7 +109,7 @@ $lang->product->changedStory = '已变更'; $lang->product->willClose = '待关闭'; $lang->product->closedStory = '已关闭'; $lang->product->unclosed = '未关闭'; -$lang->product->unplan = "未{$lang->planCommon}"; +$lang->product->unplan = "未计划"; $lang->product->viewByUser = '按用户查看'; $lang->product->allStory = '所有'; diff --git a/module/product/model.php b/module/product/model.php index 568226d687..90463bf3a0 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -443,13 +443,21 @@ class productModel extends model */ public function getStoryConceptByProduct($productID = 0) { - $product = $this->getById($productID); - $URList = $this->dao->select('`key`,`value`')->from(TABLE_LANG)->where('module')->eq('custom')->andWhere('section')->eq('URList')->andWhere('lang')->eq($this->app->clientLang)->fetchPairs(); - $SRList = $this->dao->select('`key`,`value`')->from(TABLE_LANG)->where('module')->eq('custom')->andWhere('section')->eq('SRList')->andWhere('lang')->eq($this->app->clientLang)->fetchPairs(); + $product = $this->getById($productID); + $URSRList = $this->dao->select('`key`,`value`')->from(TABLE_LANG)->where('module')->eq('custom')->andWhere('section')->eq('URSRList')->andWhere('lang')->eq($this->app->clientLang)->fetchPairs(); + + $URList = array(); + $SRList = array(); + foreach($URSRList as $key => $value) + { + $URSR = json_decode($value); + $URList[$key] = $URSR->URName; + $SRList[$key] = $URSR->SRName; + } $concept = new stdClass(); - $concept->UR = zget($URList, $product->storyConcept, $this->config->URCommonList[$this->app->clientLang]); - $concept->SR = zget($SRList, $product->storyConcept, $this->config->SRCommonList[$this->app->clientLang]); + $concept->UR = zget($URList, $product->storyConcept); + $concept->SR = zget($SRList, $product->storyConcept); return $concept; } diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php index 9ba92555e3..c3efd1899c 100644 --- a/module/productplan/lang/zh-cn.php +++ b/module/productplan/lang/zh-cn.php @@ -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->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->common = $lang->productCommon . '计划'; +$lang->productplan->browse = "浏览计划"; +$lang->productplan->index = "计划列表"; +$lang->productplan->create = "创建计划"; +$lang->productplan->edit = "编辑计划"; +$lang->productplan->delete = "删除计划"; +$lang->productplan->view = "计划详情"; $lang->productplan->bugSummary = "本页共 %s 个Bug"; $lang->productplan->basicInfo = '基本信息'; $lang->productplan->batchEdit = '批量编辑'; @@ -28,21 +28,21 @@ $lang->productplan->batchUnlinkStory = "批量移除{$lang->productSRCommon}"; $lang->productplan->linkedStories = $lang->productSRCommon; $lang->productplan->unlinkedStories = "未关联{$lang->productSRCommon}"; $lang->productplan->updateOrder = '排序'; -$lang->productplan->createChildren = "创建子{$lang->planCommon}"; +$lang->productplan->createChildren = "创建子计划"; $lang->productplan->linkBug = "关联Bug"; $lang->productplan->unlinkBug = "移除Bug"; $lang->productplan->batchUnlinkBug = "批量移除Bug"; $lang->productplan->linkedBugs = 'Bug'; $lang->productplan->unlinkedBugs = '未关联Bug'; -$lang->productplan->unexpired = "未过期{$lang->planCommon}"; -$lang->productplan->all = "所有{$lang->planCommon}"; +$lang->productplan->unexpired = "未过期计划"; +$lang->productplan->all = "所有计划"; -$lang->productplan->confirmDelete = "您确认删除该{$lang->planCommon}吗？"; +$lang->productplan->confirmDelete = "您确认删除该计划吗？"; $lang->productplan->confirmUnlinkStory = "您确认移除该{$lang->productSRCommon}吗？"; $lang->productplan->confirmUnlinkBug = "您确认移除该Bug吗？"; -$lang->productplan->noPlan = "暂时没有{$lang->planCommon}。"; -$lang->productplan->cannotDeleteParent = "不能删除父{$lang->planCommon}"; +$lang->productplan->noPlan = "暂时没有计划。"; +$lang->productplan->cannotDeleteParent = "不能删除父计划"; $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->planCommon}"; +$lang->productplan->last = "上次计划"; $lang->productplan->future = '待定'; $lang->productplan->stories = "{$lang->productSRCommon}数"; $lang->productplan->bugs = 'Bug数'; $lang->productplan->hour = $lang->hourCommon; $lang->productplan->project = $lang->projectCommon; -$lang->productplan->parent = "父{$lang->planCommon}"; +$lang->productplan->parent = "父计划"; $lang->productplan->parentAB = "父"; -$lang->productplan->children = "子{$lang->planCommon}"; +$lang->productplan->children = "子计划"; $lang->productplan->childrenAB = "子"; $lang->productplan->order = "排序"; $lang->productplan->deleted = "已删除"; diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php index 08d9cf05aa..4d59edc213 100644 --- a/module/report/lang/zh-cn.php +++ b/module/report/lang/zh-cn.php @@ -71,7 +71,7 @@ $lang->report->taskTotal = "总任务数"; $lang->report->manhourTotal = "总工时"; $lang->report->validRate = "有效率"; $lang->report->validRateTips = "方案为已解决或延期/状态为已解决或已关闭"; -$lang->report->unplanned = "未{$lang->planCommon}"; +$lang->report->unplanned = "未计划"; $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->planCommon}"; +$lang->report->overduePlan = "过期计划"; /* 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->planCommon}数"; +$lang->report->annualData->createdPlans = "累计创建计划数"; $lang->report->annualData->createdStories = "累计创建{$lang->productSRCommon}数"; $lang->report->annualData->productOverview = "{$lang->productCommon}创建{$lang->productSRCommon}数及占比"; @@ -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->planCommon}数"; +$lang->report->annualData->planCount = "计划数"; $lang->report->annualData->storyCount = "{$lang->productSRCommon}数"; $lang->report->annualData->qaData = "累计创建Bug数和创建用例数"; diff --git a/module/score/lang/zh-cn.php b/module/score/lang/zh-cn.php index bf842d88f7..7c6889be53 100644 --- a/module/score/lang/zh-cn.php +++ b/module/score/lang/zh-cn.php @@ -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->planCommon; +$lang->score->modules['productplan'] = '计划'; $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->planCommon}"; +$lang->score->methods['productplan']['create'] = "创建计划"; $lang->score->methods['release']['create'] = '创建发布'; $lang->score->methods['block']['set'] = '区块自定义设置'; $lang->score->methods['search']['saveQuery'] = '保存搜索条件'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index e281a53297..8feefeff71 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -66,7 +66,7 @@ $lang->story->zeroTask = "只列零任务{$lang->productSRCommon}"; $lang->story->reportChart = "统计报表"; $lang->story->reportAction = "统计报表"; $lang->story->copyTitle = "同{$lang->productSRCommon}名称"; -$lang->story->batchChangePlan = "批量修改{$lang->planCommon}"; +$lang->story->batchChangePlan = "批量修改计划"; $lang->story->batchChangeBranch = "批量修改分支"; $lang->story->batchChangeStage = "批量修改阶段"; $lang->story->batchAssignTo = "批量指派"; @@ -122,8 +122,8 @@ $lang->story->rejectedReason = '拒绝原因'; $lang->story->reviewedBy = '由谁评审'; $lang->story->reviewedDate = '评审时间'; $lang->story->version = '版本号'; -$lang->story->plan = "所属{$lang->planCommon}"; -$lang->story->planAB = $lang->planCommon; +$lang->story->plan = "所属计划"; +$lang->story->planAB = '计划'; $lang->story->comment = '备注'; $lang->story->children = "子{$lang->productSRCommon}"; $lang->story->childrenAB = "子"; @@ -168,7 +168,7 @@ $lang->story->statusList['changed'] = '已变更'; $lang->story->stageList[''] = ''; $lang->story->stageList['wait'] = '未开始'; -$lang->story->stageList['planned'] = "已{$lang->planCommon}"; +$lang->story->stageList['planned'] = "已计划"; $lang->story->stageList['projected'] = '已立项'; $lang->story->stageList['developing'] = '研发中'; $lang->story->stageList['developed'] = '研发完毕'; @@ -273,8 +273,8 @@ $lang->story->form->file = "附件，如果该{$lang->productSRCommon}有 $lang->story->action = new stdclass(); $lang->story->action->reviewed = array('main' => '$date, 由 $actor 记录评审结果，结果为 $extra。', 'extra' => 'reviewResultList'); $lang->story->action->closed = array('main' => '$date, 由 $actor 关闭，原因为 $extra $appendLink。', 'extra' => 'reasonList'); -$lang->story->action->linked2plan = array('main' => '$date, 由 $actor 关联到' . $lang->planCommon . ' $extra。'); -$lang->story->action->unlinkedfromplan = array('main' => '$date, 由 $actor 从' . $lang->planCommon . ' $extra 移除。'); +$lang->story->action->linked2plan = array('main' => '$date, 由 $actor 关联到计划 $extra。'); +$lang->story->action->unlinkedfromplan = array('main' => '$date, 由 $actor 从计划 $extra 移除。'); $lang->story->action->linked2project = array('main' => '$date, 由 $actor 关联到' . $lang->projectCommon . ' $extra。'); $lang->story->action->unlinkedfromproject = array('main' => '$date, 由 $actor 从' . $lang->projectCommon . ' $extra 移除。'); $lang->story->action->linked2build = array('main' => '$date, 由 $actor 关联到版本 $extra。'); @@ -296,7 +296,7 @@ $lang->story->report->value = "{$lang->productSRCommon}数"; $lang->story->report->charts['storysPerProduct'] = $lang->productCommon . "{$lang->productSRCommon}数量"; $lang->story->report->charts['storysPerModule'] = "模块{$lang->productSRCommon}数量"; $lang->story->report->charts['storysPerSource'] = "按{$lang->productSRCommon}来源统计"; -$lang->story->report->charts['storysPerPlan'] = "按{$lang->planCommon}进行统计"; +$lang->story->report->charts['storysPerPlan'] = "按计划进行统计"; $lang->story->report->charts['storysPerStatus'] = '按状态进行统计'; $lang->story->report->charts['storysPerStage'] = '按所处阶段进行统计'; $lang->story->report->charts['storysPerPri'] = '按优先级进行统计'; @@ -328,7 +328,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->planCommon; +$lang->story->report->storysPerPlan->item = '计划'; $lang->story->report->storysPerStatus->item = '状态'; $lang->story->report->storysPerStage->item = '阶段'; $lang->story->report->storysPerPri->item = '优先级'; @@ -354,7 +354,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->planCommon; +$lang->story->report->storysPerPlan->graph->xAxisName = '计划'; $lang->story->report->storysPerStatus->graph->xAxisName = '状态'; $lang->story->report->storysPerStage->graph->xAxisName = '所处阶段'; $lang->story->report->storysPerPri->graph->xAxisName = '优先级';