Ce {$lang->projectCommon
$lang->build->noBuild = 'Aucun builds.';
$lang->build->notice = new stdclass();
-$lang->build->notice->changeProduct = "La {$lang->storyCommon} ou le Bug a été associé et son product ne peut pas être modifié";
+$lang->build->notice->changeProduct = "La {$lang->productSRCommon} ou le Bug a été associé et son product ne peut pas être modifié";
-$lang->build->finishStories = " {$lang->storyCommon} Terminées %s";
+$lang->build->finishStories = " {$lang->productSRCommon} Terminées %s";
$lang->build->resolvedBugs = ' Bugs Résolus %s';
$lang->build->createdBugs = ' Bugs Signalés %s';
diff --git a/module/build/lang/vi.php b/module/build/lang/vi.php
index f1bc4bf077..4d4cde1ed0 100644
--- a/module/build/lang/vi.php
+++ b/module/build/lang/vi.php
@@ -12,17 +12,17 @@
$lang->build->common = "Bản dựng";
$lang->build->create = "Tạo bản dựng";
$lang->build->edit = "Sửa bản dựng";
-$lang->build->linkStory = "Liên kết {$lang->storyCommon}";
+$lang->build->linkStory = "Liên kết {$lang->productSRCommon}";
$lang->build->linkBug = "Liên kết Bug";
$lang->build->delete = "Xóa bản dựng";
$lang->build->deleted = "Đã xóa";
$lang->build->view = "Chi tiết bản dựng";
$lang->build->batchUnlink = 'Hủy liên kết hàng loạt';
-$lang->build->batchUnlinkStory = "Hủy liên kết {$lang->storyCommon} hàng loạt";
+$lang->build->batchUnlinkStory = "Hủy liên kết {$lang->productSRCommon} hàng loạt";
$lang->build->batchUnlinkBug = 'Hủy liên kết Bug hàng loạt';
$lang->build->confirmDelete = "Bạn có muốn xóa bản dựng này?";
-$lang->build->confirmUnlinkStory = "Bạn có muốn hủy liên kết {$lang->storyCommon} này?";
+$lang->build->confirmUnlinkStory = "Bạn có muốn hủy liên kết {$lang->productSRCommon} này?";
$lang->build->confirmUnlinkBug = "Bạn có muốn hủy liên kết this Bug?";
$lang->build->basicInfo = 'Thông tin cơ bản';
@@ -40,18 +40,18 @@ $lang->build->desc = 'Mô tả';
$lang->build->files = 'Files';
$lang->build->last = 'Bản dựng cuối';
$lang->build->packageType = 'Loại gói';
-$lang->build->unlinkStory = "Hủy liên kết {$lang->storyCommon}";
+$lang->build->unlinkStory = "Hủy liên kết {$lang->productSRCommon}";
$lang->build->unlinkBug = 'Hủy liên kết Bug';
-$lang->build->stories = "{$lang->storyCommon} đã kết thúc";
+$lang->build->stories = "{$lang->productSRCommon} đã kết thúc";
$lang->build->bugs = 'Bugs đã giải quyết';
$lang->build->generatedBugs = 'Bugs đã báo cáo';
$lang->build->noProduct = " {$lang->projectCommon} này chưa liên kết tới {$lang->productCommon}, bởi vậy Bản dựng này không thể tạo. Vui lòng liên kết {$lang->productCommon} trước";
$lang->build->noBuild = 'Không có bản dựng nào';
$lang->build->notice = new stdclass();
-$lang->build->notice->changeProduct = "{$lang->storyCommon} này hoặc Bug đã được kết hợp, và sản phẩm của nó không thể bị sửa đổi";
+$lang->build->notice->changeProduct = "{$lang->productSRCommon} này hoặc Bug đã được kết hợp, và sản phẩm của nó không thể bị sửa đổi";
-$lang->build->finishStories = " {$lang->storyCommon} đã kết thúc %s";
+$lang->build->finishStories = " {$lang->productSRCommon} đã kết thúc %s";
$lang->build->resolvedBugs = ' Bug đã giải quyết %s';
$lang->build->createdBugs = ' Bug đã báo cáo %s';
diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php
index bd399b1527..119f5302d8 100644
--- a/module/build/lang/zh-cn.php
+++ b/module/build/lang/zh-cn.php
@@ -12,17 +12,17 @@
$lang->build->common = "版本";
$lang->build->create = "创建版本";
$lang->build->edit = "编辑版本";
-$lang->build->linkStory = "关联{$lang->storyCommon}";
+$lang->build->linkStory = "关联{$lang->productSRCommon}";
$lang->build->linkBug = "关联Bug";
$lang->build->delete = "删除版本";
$lang->build->deleted = "已删除";
$lang->build->view = "版本详情";
$lang->build->batchUnlink = '批量移除';
-$lang->build->batchUnlinkStory = "批量移除{$lang->storyCommon}";
+$lang->build->batchUnlinkStory = "批量移除{$lang->productSRCommon}";
$lang->build->batchUnlinkBug = '批量移除Bug';
$lang->build->confirmDelete = "您确认删除该版本吗？";
-$lang->build->confirmUnlinkStory = "您确认移除该{$lang->storyCommon}吗？";
+$lang->build->confirmUnlinkStory = "您确认移除该{$lang->productSRCommon}吗？";
$lang->build->confirmUnlinkBug = "您确认移除该Bug吗？";
$lang->build->basicInfo = '基本信息';
@@ -40,18 +40,18 @@ $lang->build->desc = '描述';
$lang->build->files = '上传发行包';
$lang->build->last = '上个版本';
$lang->build->packageType = '包类型';
-$lang->build->unlinkStory = "移除{$lang->storyCommon}";
+$lang->build->unlinkStory = "移除{$lang->productSRCommon}";
$lang->build->unlinkBug = '移除Bug';
-$lang->build->stories = "完成的{$lang->storyCommon}";
+$lang->build->stories = "完成的{$lang->productSRCommon}";
$lang->build->bugs = '解决的Bug';
$lang->build->generatedBugs = '产生的Bug';
$lang->build->noProduct = " 该{$lang->projectCommon}没有关联{$lang->productCommon}，无法创建版本，请先关联{$lang->productCommon}";
$lang->build->noBuild = '暂时没有版本。';
$lang->build->notice = new stdclass();
-$lang->build->notice->changeProduct = "已经关联{$lang->storyCommon}或Bug的版本，不能修改其所属产品";
+$lang->build->notice->changeProduct = "已经关联{$lang->productSRCommon}或Bug的版本，不能修改其所属产品";
-$lang->build->finishStories = " 本次共完成 %s 个{$lang->storyCommon}";
+$lang->build->finishStories = " 本次共完成 %s 个{$lang->productSRCommon}";
$lang->build->resolvedBugs = ' 本次共解决 %s 个Bug';
$lang->build->createdBugs = ' 本次共产生 %s 个Bug';
diff --git a/module/build/lang/zh-tw.php b/module/build/lang/zh-tw.php
index 03d5daddbb..6a5c5f1f51 100644
--- a/module/build/lang/zh-tw.php
+++ b/module/build/lang/zh-tw.php
@@ -12,17 +12,17 @@
$lang->build->common = "版本";
$lang->build->create = "創建版本";
$lang->build->edit = "編輯版本";
-$lang->build->linkStory = "關聯{$lang->storyCommon}";
+$lang->build->linkStory = "關聯{$lang->productSRCommon}";
$lang->build->linkBug = "關聯Bug";
$lang->build->delete = "刪除版本";
$lang->build->deleted = "已刪除";
$lang->build->view = "版本詳情";
$lang->build->batchUnlink = '批量移除';
-$lang->build->batchUnlinkStory = "批量移除{$lang->storyCommon}";
+$lang->build->batchUnlinkStory = "批量移除{$lang->productSRCommon}";
$lang->build->batchUnlinkBug = '批量移除Bug';
$lang->build->confirmDelete = "您確認刪除該版本嗎？";
-$lang->build->confirmUnlinkStory = "您確認移除該{$lang->storyCommon}嗎？";
+$lang->build->confirmUnlinkStory = "您確認移除該{$lang->productSRCommon}嗎？";
$lang->build->confirmUnlinkBug = "您確認移除該Bug嗎？";
$lang->build->basicInfo = '基本信息';
@@ -40,18 +40,18 @@ $lang->build->desc = '描述';
$lang->build->files = '上傳發行包';
$lang->build->last = '上個版本';
$lang->build->packageType = '包類型';
-$lang->build->unlinkStory = "移除{$lang->storyCommon}";
+$lang->build->unlinkStory = "移除{$lang->productSRCommon}";
$lang->build->unlinkBug = '移除Bug';
-$lang->build->stories = "完成的{$lang->storyCommon}";
+$lang->build->stories = "完成的{$lang->productSRCommon}";
$lang->build->bugs = '解決的Bug';
$lang->build->generatedBugs = '產生的Bug';
$lang->build->noProduct = " 該{$lang->projectCommon}沒有關聯{$lang->productCommon}，無法創建版本，請先關聯{$lang->productCommon}";
$lang->build->noBuild = '暫時沒有版本。';
$lang->build->notice = new stdclass();
-$lang->build->notice->changeProduct = "已經關聯{$lang->storyCommon}或Bug的版本，不能修改其所屬產品";
+$lang->build->notice->changeProduct = "已經關聯{$lang->productSRCommon}或Bug的版本，不能修改其所屬產品";
-$lang->build->finishStories = " 本次共完成 %s 個{$lang->storyCommon}";
+$lang->build->finishStories = " 本次共完成 %s 個{$lang->productSRCommon}";
$lang->build->resolvedBugs = ' 本次共解決 %s 個Bug';
$lang->build->createdBugs = ' 本次共產生 %s 個Bug';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 3a39a2e03e..6628e10e36 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -165,8 +165,8 @@ $lang->product->menu->home = '主页|product|index|';
$lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create,batchedit');
$lang->product->viewMenu = new stdclass();
-if($config->URAndSR) $lang->product->viewMenu->requirement = array('link' => "$URCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->viewMenu->story = array('link' => "$lang->storyCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
+if($config->URAndSR) $lang->product->viewMenu->requirement = array('link' => "$lang->productURCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->viewMenu->story = array('link' => "$lang->productSRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->viewMenu->track = array('link' => "跟踪矩阵|story|track|productID=%s");
$lang->product->viewMenu->plan = array('link' => "计划|productplan|browse|productID=%s", 'subModule' => 'productplan');
$lang->product->viewMenu->release = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release');
@@ -215,7 +215,7 @@ $lang->measurement->menu = new stdclass();
/* 查询条中可以选择的对象列表。*/
$lang->searchObjects['bug'] = 'Bug';
-$lang->searchObjects['story'] = "{$lang->storyCommon}";
+$lang->searchObjects['story'] = "{$lang->productSRCommon}";
$lang->searchObjects['task'] = '任务';
$lang->searchObjects['testcase'] = '用例';
$lang->searchObjects['project'] = $lang->projectCommon;
@@ -293,7 +293,7 @@ $lang->todo->menu = $lang->my->menu;
$lang->scrumproduct = new stdclass();
$lang->scrumproduct->menu = new stdclass();
-$lang->scrumproduct->menu->story = array('link' => "{$lang->storyCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->scrumproduct->menu->story = array('link' => "{$lang->projectSRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->scrumproduct->menu->plan = array('link' => "{$lang->planCommon}|productplan|browse|productID=%s", 'subModule' => 'productplan');
//$lang->scrumproduct->menu->release = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release');
$lang->scrumproduct->menu->roadmap = '路线图|product|roadmap|productID=%s';
@@ -306,8 +306,8 @@ $lang->scrumproduct->menu->view = array('link' => '概况|product|view|produc
if($config->URAndSR)
{
- $lang->scrumproduct->menu->requirement = array('link' => "{$URCommon}|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
- $lang->scrumproduct->menu->story = array('link' => "{$SRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
+ $lang->scrumproduct->menu->requirement = array('link' => "{$lang->projectURCommon}|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
+ $lang->scrumproduct->menu->story = array('link' => "{$lang->projectSRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
}
$lang->product->dividerMenu = ',project,doc,';
@@ -324,7 +324,7 @@ $lang->project->menu->task = array('link' => '任务|project|task|projectID
$lang->project->menu->kanban = array('link' => '看板|project|kanban|projectID=%s');
$lang->project->menu->burn = array('link' => '燃尽图|project|burn|projectID=%s');
$lang->project->menu->list = array('link' => '更多|project|grouptask|projectID=%s', 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover');
-$lang->project->menu->story = array('link' => "{$lang->storyCommon}|project|story|projectID=%s", 'subModule' => 'story', 'alias' => 'linkstory,storykanban');
+$lang->project->menu->story = array('link' => "{$lang->projectSRCommon}|project|story|projectID=%s", 'subModule' => 'story', 'alias' => 'linkstory,storykanban');
$lang->project->menu->qa = array('link' => '测试|project|bug|projectID=%s', 'subModule' => 'bug,build,testtask', 'alias' => 'build,testtask', 'class' => 'dropdown dropdown-hover');
$lang->project->menu->doc = array('link' => '文档|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc');
$lang->project->menu->action = array('link' => '动态|project|dynamic|projectID=%s', 'subModule' => 'dynamic', 'class' => 'dropdown dropdown-hover');
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index e05f749ccf..1c5233010a 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -166,7 +166,7 @@ $lang->product->menu->list = array('link' => $lang->productCommon . '|product|al
$lang->product->viewMenu = new stdclass();
if($config->URAndSR) $lang->product->viewMenu->requirement = array('link' => "$URCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->viewMenu->story = array('link' => "$lang->storyCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->viewMenu->story = array('link' => "$lang->productSRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->viewMenu->plan = array('link' => "計劃|productplan|browse|productID=%s", 'subModule' => 'productplan');
$lang->product->viewMenu->release = array('link' => '發佈|release|browse|productID=%s', 'subModule' => 'release');
$lang->product->viewMenu->roadmap = '路線圖|product|roadmap|productID=%s';
@@ -214,7 +214,7 @@ $lang->measurement->menu = new stdclass();
/* 查詢條中可以選擇的對象列表。*/
$lang->searchObjects['bug'] = 'Bug';
-$lang->searchObjects['story'] = "{$lang->storyCommon}";
+$lang->searchObjects['story'] = "{$lang->productSRCommon}";
$lang->searchObjects['task'] = '任務';
$lang->searchObjects['testcase'] = '用例';
$lang->searchObjects['project'] = $lang->projectCommon;
@@ -292,7 +292,7 @@ $lang->todo->menu = $lang->my->menu;
$lang->scrumproduct = new stdclass();
$lang->scrumproduct->menu = new stdclass();
-$lang->scrumproduct->menu->story = array('link' => "{$lang->storyCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->scrumproduct->menu->story = array('link' => "{$lang->productSRCommon}|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->scrumproduct->menu->plan = array('link' => "{$lang->planCommon}|productplan|browse|productID=%s", 'subModule' => 'productplan');
//$lang->scrumproduct->menu->release = array('link' => '發佈|release|browse|productID=%s', 'subModule' => 'release');
$lang->scrumproduct->menu->roadmap = '路線圖|product|roadmap|productID=%s';
@@ -323,7 +323,7 @@ $lang->project->menu->task = array('link' => '任務|project|task|projectID
$lang->project->menu->kanban = array('link' => '看板|project|kanban|projectID=%s');
$lang->project->menu->burn = array('link' => '燃盡圖|project|burn|projectID=%s');
$lang->project->menu->list = array('link' => '更多|project|grouptask|projectID=%s', 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover');
-$lang->project->menu->story = array('link' => "{$lang->storyCommon}|project|story|projectID=%s", 'subModule' => 'story', 'alias' => 'linkstory,storykanban');
+$lang->project->menu->story = array('link' => "{$lang->productSRCommon}|project|story|projectID=%s", 'subModule' => 'story', 'alias' => 'linkstory,storykanban');
$lang->project->menu->qa = array('link' => '測試|project|bug|projectID=%s', 'subModule' => 'bug,build,testtask', 'alias' => 'build,testtask', 'class' => 'dropdown dropdown-hover');
$lang->project->menu->doc = array('link' => '文檔|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc');
$lang->project->menu->action = array('link' => '動態|project|dynamic|projectID=%s', 'subModule' => 'dynamic', 'class' => 'dropdown dropdown-hover');
diff --git a/module/convert/lang/zh-cn.php b/module/convert/lang/zh-cn.php
index 19b314016b..9dda4ab79a 100644
--- a/module/convert/lang/zh-cn.php
+++ b/module/convert/lang/zh-cn.php
@@ -35,7 +35,7 @@ $lang->convert->aimTypeOfZentao = '转化为Zentao中的类型';
$lang->convert->directionList['bug'] = 'Bug';
$lang->convert->directionList['task'] = '任务';
-$lang->convert->directionList['story'] = $lang->storyCommon;
+$lang->convert->directionList['story'] = $lang->productSRCommon;
$lang->convert->sourceList['BugFree'] = array('bugfree_1' => '1.x', 'bugfree_2' => '2.x');
$lang->convert->sourceList['Redmine'] = array('Redmine_1.1' => '1.1');
@@ -79,7 +79,7 @@ $lang->convert->redmine->users = '用户';
$lang->convert->redmine->groups = '用户分组';
$lang->convert->redmine->products = $lang->productCommon;
$lang->convert->redmine->projects = $lang->projectCommon;
-$lang->convert->redmine->stories = $lang->storyCommon;
+$lang->convert->redmine->stories = $lang->productSRCommon;
$lang->convert->redmine->tasks = '任务';
$lang->convert->redmine->bugs = 'Bug';
$lang->convert->redmine->productPlans = $lang->productCommon . '计划';
diff --git a/module/convert/lang/zh-tw.php b/module/convert/lang/zh-tw.php
index 93b476f90d..ce686b5f98 100644
--- a/module/convert/lang/zh-tw.php
+++ b/module/convert/lang/zh-tw.php
@@ -35,7 +35,7 @@ $lang->convert->aimTypeOfZentao = '轉化為Zentao中的類型';
$lang->convert->directionList['bug'] = 'Bug';
$lang->convert->directionList['task'] = '任務';
-$lang->convert->directionList['story'] = $lang->storyCommon;
+$lang->convert->directionList['story'] = $lang->productSRCommon;
$lang->convert->sourceList['BugFree'] = array('bugfree_1' => '1.x', 'bugfree_2' => '2.x');
$lang->convert->sourceList['Redmine'] = array('Redmine_1.1' => '1.1');
@@ -79,7 +79,7 @@ $lang->convert->redmine->users = '用戶';
$lang->convert->redmine->groups = '用戶分組';
$lang->convert->redmine->products = $lang->productCommon;
$lang->convert->redmine->projects = $lang->projectCommon;
-$lang->convert->redmine->stories = $lang->storyCommon;
+$lang->convert->redmine->stories = $lang->productSRCommon;
$lang->convert->redmine->tasks = '任務';
$lang->convert->redmine->bugs = 'Bug';
$lang->convert->redmine->productPlans = $lang->productCommon . '計劃';
diff --git a/module/custom/control.php b/module/custom/control.php
index bcb1081fde..46f86f3d4f 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -245,7 +245,7 @@ class custom extends control
$locate = inlink('flow');
if(!isset($this->config->conceptSetted)) $this->lang->custom->notice->conceptResult .= $this->lang->custom->notice->conceptPath;
if(!isset($this->config->conceptSetted)) $locate = helper::createLink('my', 'index');
- $message = sprintf($this->lang->custom->notice->conceptResult, $this->lang->productCommon, $this->lang->projectCommon, $this->lang->storyCommon, $this->lang->hourCommon);
+ $message = sprintf($this->lang->custom->notice->conceptResult, $this->lang->productCommon, $this->lang->projectCommon, $this->lang->productSRCommon, $this->lang->hourCommon);
$this->send(array('result' => 'success', 'notice' => $message, 'locate' => $locate));
}
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index db2be077c1..50715aea7c 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -72,7 +72,7 @@ $lang->custom->closedProduct = '已关闭' . $lang->productCommon;
$lang->custom->object['product'] = $lang->productCommon;
$lang->custom->object['project'] = $lang->projectCommon;
-$lang->custom->object['story'] = $lang->storyCommon;
+$lang->custom->object['story'] = $lang->productSRCommon;
$lang->custom->object['task'] = '任务';
$lang->custom->object['bug'] = 'Bug';
$lang->custom->object['testcase'] = '用例';
@@ -152,7 +152,7 @@ $lang->custom->notice->noClosedBlock = '没有永久关闭的区
$lang->custom->notice->required = '页面提交时，选中的字段必填';
$lang->custom->notice->conceptResult = '我们已经根据您的选择为您设置了 %s-%s 模式，使用%s + %s。';
$lang->custom->notice->conceptPath = '您可以在：后台 -> 自定义 -> 流程页面修改。';
-$lang->custom->notice->readOnlyOfProduct = '禁止修改后，已关闭' . $lang->productCommon . '下的' . $lang->storyCommon . '、Bug、用例、日志、发布、计划都禁止修改。';
+$lang->custom->notice->readOnlyOfProduct = '禁止修改后，已关闭' . $lang->productCommon . '下的' . $lang->productSRCommon . '、Bug、用例、日志、发布、计划都禁止修改。';
$lang->custom->notice->readOnlyOfProject = '禁止修改后，已关闭' . $lang->projectCommon . '下的任务、版本、日志以及关联需求都禁止修改。';
$lang->custom->notice->URSREmpty = '自定义需求名称不能为空！';
diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php
index ed66d125a5..5ab89f9987 100644
--- a/module/custom/lang/zh-tw.php
+++ b/module/custom/lang/zh-tw.php
@@ -72,7 +72,7 @@ $lang->custom->closedProduct = '已關閉' . $lang->productCommon;
$lang->custom->object['product'] = $lang->productCommon;
$lang->custom->object['project'] = $lang->projectCommon;
-$lang->custom->object['story'] = $lang->storyCommon;
+$lang->custom->object['story'] = $lang->productSRCommon;
$lang->custom->object['task'] = '任務';
$lang->custom->object['bug'] = 'Bug';
$lang->custom->object['testcase'] = '用例';
@@ -152,7 +152,7 @@ $lang->custom->notice->noClosedBlock = '沒有永久關閉的區
$lang->custom->notice->required = '頁面提交時，選中的欄位必填';
$lang->custom->notice->conceptResult = '我們已經根據您的選擇為您設置了 %s-%s 模式，使用%s + %s。';
$lang->custom->notice->conceptPath = '您可以在：後台 -> 自定義 -> 流程頁面修改。';
-$lang->custom->notice->readOnlyOfProduct = '禁止修改後，已關閉' . $lang->productCommon . '下的' . $lang->storyCommon . '、Bug、用例、日誌、發佈、計劃都禁止修改。';
+$lang->custom->notice->readOnlyOfProduct = '禁止修改後，已關閉' . $lang->productCommon . '下的' . $lang->productSRCommon . '、Bug、用例、日誌、發佈、計劃都禁止修改。';
$lang->custom->notice->readOnlyOfProject = '禁止修改後，已關閉' . $lang->projectCommon . '下的任務、版本、日誌以及關聯需求都禁止修改。';
$lang->custom->notice->indexPage['product'] = "從8.2版本起增加了產品主頁視圖，是否預設進入產品主頁？";
diff --git a/module/design/lang/de.php b/module/design/lang/de.php
index 0c57190cb2..08e5c49db7 100644
--- a/module/design/lang/de.php
+++ b/module/design/lang/de.php
@@ -29,7 +29,7 @@ $lang->design->product = 'Linked Product';
$lang->design->basicInfo = 'Basic Information';
$lang->design->commitBy = 'Commit By';
$lang->design->commitDate = 'Committed Date';
-$lang->design->affectedStory = "{$lang->storyCommon}";
+$lang->design->affectedStory = "{$lang->productSRCommon}";
$lang->design->affectedTasks = 'Task';
$lang->design->reviewObject = 'Review Object';
$lang->design->createdBy = 'CreatedBy';
diff --git a/module/design/lang/en.php b/module/design/lang/en.php
index 0c57190cb2..08e5c49db7 100644
--- a/module/design/lang/en.php
+++ b/module/design/lang/en.php
@@ -29,7 +29,7 @@ $lang->design->product = 'Linked Product';
$lang->design->basicInfo = 'Basic Information';
$lang->design->commitBy = 'Commit By';
$lang->design->commitDate = 'Committed Date';
-$lang->design->affectedStory = "{$lang->storyCommon}";
+$lang->design->affectedStory = "{$lang->productSRCommon}";
$lang->design->affectedTasks = 'Task';
$lang->design->reviewObject = 'Review Object';
$lang->design->createdBy = 'CreatedBy';
diff --git a/module/design/lang/fr.php b/module/design/lang/fr.php
index 0c57190cb2..08e5c49db7 100644
--- a/module/design/lang/fr.php
+++ b/module/design/lang/fr.php
@@ -29,7 +29,7 @@ $lang->design->product = 'Linked Product';
$lang->design->basicInfo = 'Basic Information';
$lang->design->commitBy = 'Commit By';
$lang->design->commitDate = 'Committed Date';
-$lang->design->affectedStory = "{$lang->storyCommon}";
+$lang->design->affectedStory = "{$lang->productSRCommon}";
$lang->design->affectedTasks = 'Task';
$lang->design->reviewObject = 'Review Object';
$lang->design->createdBy = 'CreatedBy';
diff --git a/module/design/lang/vi.php b/module/design/lang/vi.php
index 0c57190cb2..08e5c49db7 100644
--- a/module/design/lang/vi.php
+++ b/module/design/lang/vi.php
@@ -29,7 +29,7 @@ $lang->design->product = 'Linked Product';
$lang->design->basicInfo = 'Basic Information';
$lang->design->commitBy = 'Commit By';
$lang->design->commitDate = 'Committed Date';
-$lang->design->affectedStory = "{$lang->storyCommon}";
+$lang->design->affectedStory = "{$lang->productSRCommon}";
$lang->design->affectedTasks = 'Task';
$lang->design->reviewObject = 'Review Object';
$lang->design->createdBy = 'CreatedBy';
diff --git a/module/design/lang/zh-cn.php b/module/design/lang/zh-cn.php
index f0c8b4b63d..b313918b90 100644
--- a/module/design/lang/zh-cn.php
+++ b/module/design/lang/zh-cn.php
@@ -29,7 +29,7 @@ $lang->design->product = '所属产品';
$lang->design->basicInfo = '基础信息';
$lang->design->commitBy = '由谁提交';
$lang->design->commitDate = '提交时间';
-$lang->design->affectedStory = "影响{$lang->storyCommon}";
+$lang->design->affectedStory = "影响{$lang->productSRCommon}";
$lang->design->affectedTasks = '影响任务';
$lang->design->reviewObject = '评审对象';
$lang->design->createdBy = '由谁创建';
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index c932c62b2e..9526082bcb 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -52,10 +52,10 @@ $lang->dev->tableList['product'] = $lang->productCommon;
$lang->dev->tableList['productplan'] = $lang->productCommon . '计划';
$lang->dev->tableList['project'] = $lang->projectCommon;
$lang->dev->tableList['projectproduct'] = $lang->projectCommon . $lang->productCommon;
-$lang->dev->tableList['projectstory'] = $lang->projectCommon . $lang->storyCommon;
+$lang->dev->tableList['projectstory'] = $lang->projectCommon . $lang->productSRCommon;
$lang->dev->tableList['release'] = '发布';
-$lang->dev->tableList['story'] = $lang->storyCommon;
-$lang->dev->tableList['storyspec'] = "{$lang->storyCommon}描述";
+$lang->dev->tableList['story'] = $lang->productSRCommon;
+$lang->dev->tableList['storyspec'] = "{$lang->productSRCommon}描述";
$lang->dev->tableList['task'] = '任务';
$lang->dev->tableList['taskestimate'] = '任务预计';
$lang->dev->tableList['team'] = '团队';
@@ -96,7 +96,7 @@ $lang->dev->tableList['datatable'] = '数据表格';
$lang->dev->tableList['block'] = '区块';
$lang->dev->tableList['branch'] = '平台/分支';
$lang->dev->tableList['doccontent'] = '文档内容';
-$lang->dev->tableList['storystage'] = "{$lang->storyCommon}阶段";
+$lang->dev->tableList['storystage'] = "{$lang->productSRCommon}阶段";
$lang->dev->tableList['tutorial'] = '新手教程';
$lang->dev->tableList['suitecase'] = '套件用例';
$lang->dev->tableList['score'] = '积分';
diff --git a/module/dev/lang/zh-tw.php b/module/dev/lang/zh-tw.php
index fecbf9efc0..0755582e01 100644
--- a/module/dev/lang/zh-tw.php
+++ b/module/dev/lang/zh-tw.php
@@ -52,10 +52,10 @@ $lang->dev->tableList['product'] = $lang->productCommon;
$lang->dev->tableList['productplan'] = $lang->productCommon . '計劃';
$lang->dev->tableList['project'] = $lang->projectCommon;
$lang->dev->tableList['projectproduct'] = $lang->projectCommon . $lang->productCommon;
-$lang->dev->tableList['projectstory'] = $lang->projectCommon . $lang->storyCommon;
+$lang->dev->tableList['projectstory'] = $lang->projectCommon . $lang->productSRCommon;
$lang->dev->tableList['release'] = '發佈';
-$lang->dev->tableList['story'] = $lang->storyCommon;
-$lang->dev->tableList['storyspec'] = "{$lang->storyCommon}描述";
+$lang->dev->tableList['story'] = $lang->productSRCommon;
+$lang->dev->tableList['storyspec'] = "{$lang->productSRCommon}描述";
$lang->dev->tableList['task'] = '任務';
$lang->dev->tableList['taskestimate'] = '任務預計';
$lang->dev->tableList['team'] = '團隊';
@@ -96,7 +96,7 @@ $lang->dev->tableList['datatable'] = '數據表格';
$lang->dev->tableList['block'] = '區塊';
$lang->dev->tableList['branch'] = '平台/分支';
$lang->dev->tableList['doccontent'] = '文檔內容';
-$lang->dev->tableList['storystage'] = "{$lang->storyCommon}階段";
+$lang->dev->tableList['storystage'] = "{$lang->productSRCommon}階段";
$lang->dev->tableList['tutorial'] = '新手教程';
$lang->dev->tableList['suitecase'] = '套件用例';
$lang->dev->tableList['score'] = '積分';
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index 99db1556ee..887336b91e 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -179,7 +179,7 @@ $lang->misc->feature->all['11.5.stable'][] = array('title'=>'集成新版本客
$lang->misc->feature->all['11.4.1'][] = array('title'=>'完善细节，修复Bug', 'desc' => '');
-$lang->misc->feature->all["11.4.stable"][] = array("title"=>"完善细节，修复Bug", "desc" => "增强测试任务管理
优化计划、发布、版本关联{$lang->storyCommon}和bug的交互
文档库可以自定义是否显示子分类里的文档
修复bug，完善细节
");
+$lang->misc->feature->all["11.4.stable"][] = array("title"=>"完善细节，修复Bug", "desc" => "增强测试任务管理
优化计划、发布、版本关联{$lang->productSRCommon}和bug的交互
文档库可以自定义是否显示子分类里的文档
修复bug，完善细节
");
$lang->misc->feature->all['11.3.stable'][] = array('title'=>'完善细节，修复Bug', 'desc' => '计划添加子计划功能
优化chosen交互
添加时区设置
优化文档库和文档
');
@@ -231,14 +231,14 @@ $lang->misc->feature->all['8.3.stable'][] = array('title'=>'调整文档功能',
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'首页自定义', 'desc' => '我的地盘由我做主。现在开始，你可以向首页添加多种多样的内容区块，而且还可以决定如何排列和显示他们。
我的地盘、产品、项目、测试模块下均支持首页自定义功能。
');
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'导航定制', 'desc' => '导航上显示的项目现在完全由你来决定，不仅仅可以决定在导航上展示哪些内容，还可以决定展示的顺序。
将鼠标悬浮在导航上稍后会在右侧显示定制按钮，点击打开定制对话框，通过点击切换是否显示，拖放操作来更改显示顺序。
');
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'批量添加、编辑自定义', 'desc' => '可以在批量添加和批量编辑页面自定义操作的字段。
');
-$lang->misc->feature->all['8.2.stable'][] = array('title'=>"添加{$lang->storyCommon}、任务、Bug、用例自定义", 'desc' => "可以在添加{$lang->storyCommon}、任务、Bug、用例页面，自定义部分字段是否显示。
");
-$lang->misc->feature->all['8.2.stable'][] = array('title'=>'导出自定义', 'desc' => "在导出{$lang->storyCommon}、任务、Bug、用例的时候，用户可以自定义导出的字段，也可以保存模板方便每次导出。
");
-$lang->misc->feature->all['8.2.stable'][] = array('title'=>"{$lang->storyCommon}、任务、Bug、用例组合检索功能", 'desc' => "在{$lang->storyCommon}、任务、Bug、用例列表页面，可以实现模块和标签的组合检索。
");
+$lang->misc->feature->all['8.2.stable'][] = array('title'=>"添加{$lang->productSRCommon}、任务、Bug、用例自定义", 'desc' => "可以在添加{$lang->productSRCommon}、任务、Bug、用例页面，自定义部分字段是否显示。
");
+$lang->misc->feature->all['8.2.stable'][] = array('title'=>'导出自定义', 'desc' => "在导出{$lang->productSRCommon}、任务、Bug、用例的时候，用户可以自定义导出的字段，也可以保存模板方便每次导出。
");
+$lang->misc->feature->all['8.2.stable'][] = array('title'=>"{$lang->productSRCommon}、任务、Bug、用例组合检索功能", 'desc' => "在{$lang->productSRCommon}、任务、Bug、用例列表页面，可以实现模块和标签的组合检索。
");
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'增加新手教程', 'desc' => '增加新手教程，方便新用户了解禅道使用。
');
-$lang->misc->feature->all['7.4.beta'][] = array('title'=>'产品实现分支功能', 'desc' => "产品增加分支/平台类型，相应的{$lang->storyCommon}、计划、Bug、用例、模块等都增加分支。
");
+$lang->misc->feature->all['7.4.beta'][] = array('title'=>'产品实现分支功能', 'desc' => "产品增加分支/平台类型，相应的{$lang->productSRCommon}、计划、Bug、用例、模块等都增加分支。
");
$lang->misc->feature->all['7.4.beta'][] = array('title'=>'调整发布模块', 'desc' => '发布增加停止维护操作，当发布停止维护时，创建Bug将不显示这个发布。
发布中遗留的bug改为手工关联。
');
-$lang->misc->feature->all['7.4.beta'][] = array('title'=>"调整{$lang->storyCommon}和Bug的创建页面", 'desc' => '');
+$lang->misc->feature->all['7.4.beta'][] = array('title'=>"调整{$lang->productSRCommon}和Bug的创建页面", 'desc' => '');
$lang->misc->feature->all['7.2.stable'][] = array('title'=>'增强安全', 'desc' => '加强对管理员弱口令的检查。
写插件，上传插件的时候需要创建ok文件。
敏感操作增加管理员口令的检查
对输入内容做striptags, specialchars处理。
');
$lang->misc->feature->all['7.2.stable'][] = array('title'=>'完善细节', 'desc' => '');
diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php
index 6d233854e1..9c58533396 100644
--- a/module/misc/lang/zh-tw.php
+++ b/module/misc/lang/zh-tw.php
@@ -176,7 +176,7 @@ $lang->misc->feature->all['11.5.stable'][] = array('title'=>'整合新版本客
$lang->misc->feature->all['11.4.1'][] = array('title'=>'完善細節，修復Bug', 'desc' => '');
-$lang->misc->feature->all["11.4.stable"][] = array("title"=>"完善細節，修復Bug", "desc" => "增強測試任務管理
優化計劃、發佈、版本關聯{$lang->storyCommon}和bug的交互
文檔庫可以自定義是否顯示子分類裡的文檔
修復bug，完善細節
");
+$lang->misc->feature->all["11.4.stable"][] = array("title"=>"完善細節，修復Bug", "desc" => "增強測試任務管理
優化計劃、發佈、版本關聯{$lang->productSRCommon}和bug的交互
文檔庫可以自定義是否顯示子分類裡的文檔
修復bug，完善細節
");
$lang->misc->feature->all['11.3.stable'][] = array('title'=>'完善細節，修復Bug', 'desc' => '計劃添加子計劃功能
優化chosen交互
添加時區設置
優化文檔庫和文檔
');
@@ -228,14 +228,14 @@ $lang->misc->feature->all['8.3.stable'][] = array('title'=>'調整文檔功能',
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'首頁自定義', 'desc' => '我的地盤由我做主。現在開始，你可以向首頁添加多種多樣的內容區塊，而且還可以決定如何排列和顯示他們。
我的地盤、產品、項目、測試模組下均支持首頁自定義功能。
');
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'導航定製', 'desc' => '導航上顯示的項目現在完全由你來決定，不僅僅可以決定在導航上展示哪些內容，還可以決定展示的順序。
將滑鼠懸浮在導航上稍後會在右側顯示定製按鈕，點擊打開定製對話框，通過點擊切換是否顯示，拖放操作來更改顯示順序。
');
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'批量添加、編輯自定義', 'desc' => '可以在批量添加和批量編輯頁面自定義操作的欄位。
');
-$lang->misc->feature->all['8.2.stable'][] = array('title'=>"添加{$lang->storyCommon}、任務、Bug、用例自定義", 'desc' => "可以在添加{$lang->storyCommon}、任務、Bug、用例頁面，自定義部分欄位是否顯示。
");
-$lang->misc->feature->all['8.2.stable'][] = array('title'=>'導出自定義', 'desc' => "在導出{$lang->storyCommon}、任務、Bug、用例的時候，用戶可以自定義導出的欄位，也可以保存模板方便每次導出。
");
-$lang->misc->feature->all['8.2.stable'][] = array('title'=>"{$lang->storyCommon}、任務、Bug、用例組合檢索功能", 'desc' => "在{$lang->storyCommon}、任務、Bug、用例列表頁面，可以實現模組和標籤的組合檢索。
");
+$lang->misc->feature->all['8.2.stable'][] = array('title'=>"添加{$lang->productSRCommon}、任務、Bug、用例自定義", 'desc' => "可以在添加{$lang->productSRCommon}、任務、Bug、用例頁面，自定義部分欄位是否顯示。
");
+$lang->misc->feature->all['8.2.stable'][] = array('title'=>'導出自定義', 'desc' => "在導出{$lang->productSRCommon}、任務、Bug、用例的時候，用戶可以自定義導出的欄位，也可以保存模板方便每次導出。
");
+$lang->misc->feature->all['8.2.stable'][] = array('title'=>"{$lang->productSRCommon}、任務、Bug、用例組合檢索功能", 'desc' => "在{$lang->productSRCommon}、任務、Bug、用例列表頁面，可以實現模組和標籤的組合檢索。
");
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'增加新手教程', 'desc' => '增加新手教程，方便新用戶瞭解禪道使用。
');
-$lang->misc->feature->all['7.4.beta'][] = array('title'=>'產品實現分支功能', 'desc' => "產品增加分支/平台類型，相應的{$lang->storyCommon}、計劃、Bug、用例、模組等都增加分支。
");
+$lang->misc->feature->all['7.4.beta'][] = array('title'=>'產品實現分支功能', 'desc' => "產品增加分支/平台類型，相應的{$lang->productSRCommon}、計劃、Bug、用例、模組等都增加分支。
");
$lang->misc->feature->all['7.4.beta'][] = array('title'=>'調整發佈模組', 'desc' => '發佈增加停止維護操作，當發佈停止維護時，創建Bug將不顯示這個發佈。
發佈中遺留的bug改為手工關聯。
');
-$lang->misc->feature->all['7.4.beta'][] = array('title'=>"調整{$lang->storyCommon}和Bug的創建頁面", 'desc' => '');
+$lang->misc->feature->all['7.4.beta'][] = array('title'=>"調整{$lang->productSRCommon}和Bug的創建頁面", 'desc' => '');
$lang->misc->feature->all['7.2.stable'][] = array('title'=>'增強安全', 'desc' => '加強對管理員弱口令的檢查。
寫插件，上傳插件的時候需要創建ok檔案。
敏感操作增加管理員口令的檢查
對輸入內容做striptags, specialchars處理。
');
$lang->misc->feature->all['7.2.stable'][] = array('title'=>'完善細節', 'desc' => '');
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index 3cf1d9c048..5f3ae77004 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -9,8 +9,8 @@ $lang->my->task = '我的任务';
$lang->my->bug = '我的Bug';
$lang->my->testTask = '我的版本';
$lang->my->testCase = '我的用例';
-$lang->my->story = "我的{$lang->storyCommon}";
-$lang->my->requirement = "我的用户{$lang->storyCommon}";
+$lang->my->story = "我的{$lang->productSRCommon}";
+$lang->my->requirement = "我的用户{$lang->productSRCommon}";
$lang->my->createProgram = '添加项目';
$lang->my->project = "我的项目";
$lang->my->execution = '我的执行';
diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php
index fa268fab0e..46be93619c 100644
--- a/module/my/lang/zh-tw.php
+++ b/module/my/lang/zh-tw.php
@@ -9,8 +9,8 @@ $lang->my->task = '我的任務';
$lang->my->bug = '我的Bug';
$lang->my->testTask = '我的版本';
$lang->my->testCase = '我的用例';
-$lang->my->story = "我的{$lang->storyCommon}";
-$lang->my->requirement = "我的用戶{$lang->storyCommon}";
+$lang->my->story = "我的{$lang->productSRCommon}";
+$lang->my->requirement = "我的用戶{$lang->productSRCommon}";
$lang->my->createProgram = '添加項目';
$lang->my->project = "我的項目";
$lang->my->execution = '我的執行';
diff --git a/module/product/control.php b/module/product/control.php
index ecba1d1acb..0ed3d9184a 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -199,7 +199,7 @@ class product extends control
/* Change for requirement story title. */
if($storyType == 'requirement' and $this->config->URAndSR)
{
- $this->lang->story->title = str_replace($this->lang->SRCommon, $this->lang->URCommon, $this->lang->story->title);
+ $this->lang->story->title = str_replace($this->lang->productSRCommon, $this->lang->productURCommon, $this->lang->story->title);
$this->config->product->search['fields']['title'] = $this->lang->story->title;
}
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index d8f7f39c4f..90610939b8 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -11,7 +11,7 @@
*/
$lang->product->common = $lang->productCommon . '视图';
$lang->product->index = $lang->productCommon . '主页';
-$lang->product->browse = "{$lang->storyCommon}列表";
+$lang->product->browse = "{$lang->productSRCommon}列表";
$lang->product->dynamic = '产品动态';
$lang->product->view = "{$lang->productCommon}概况";
$lang->product->edit = "编辑{$lang->productCommon}";
@@ -48,14 +48,14 @@ $lang->product->build = '版本列表';
$lang->product->projectInfo = "所有与此产品关联的{$lang->projectCommon}";
$lang->product->currentProject = '当前' . $lang->projectCommon;
-$lang->product->activeStories = "激活{$lang->storyCommon}";
-$lang->product->activeStoriesTitle = "激活{$lang->storyCommon}";
-$lang->product->changedStories = "已变更{$lang->storyCommon}";
-$lang->product->changedStoriesTitle = "已变更{$lang->storyCommon}";
-$lang->product->draftStories = "草稿{$lang->storyCommon}";
-$lang->product->draftStoriesTitle = "草稿{$lang->storyCommon}";
-$lang->product->closedStories = "已关闭{$lang->storyCommon}";
-$lang->product->closedStoriesTitle = "已关闭{$lang->storyCommon}";
+$lang->product->activeStories = "激活{$lang->productSRCommon}";
+$lang->product->activeStoriesTitle = "激活{$lang->productSRCommon}";
+$lang->product->changedStories = "已变更{$lang->productSRCommon}";
+$lang->product->changedStoriesTitle = "已变更{$lang->productSRCommon}";
+$lang->product->draftStories = "草稿{$lang->productSRCommon}";
+$lang->product->draftStoriesTitle = "草稿{$lang->productSRCommon}";
+$lang->product->closedStories = "已关闭{$lang->productSRCommon}";
+$lang->product->closedStoriesTitle = "已关闭{$lang->productSRCommon}";
$lang->product->unResolvedBugs = '未解决Bug';
$lang->product->unResolvedBugsTitle = '未解决Bug';
$lang->product->assignToNullBugs = '未指派Bug';
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index e1cd7a7493..985c69e4cb 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -11,7 +11,7 @@
*/
$lang->product->common = $lang->productCommon . '視圖';
$lang->product->index = $lang->productCommon . '主頁';
-$lang->product->browse = "{$lang->storyCommon}列表";
+$lang->product->browse = "{$lang->productSRCommon}列表";
$lang->product->dynamic = '產品動態';
$lang->product->view = "{$lang->productCommon}概況";
$lang->product->edit = "編輯{$lang->productCommon}";
@@ -48,14 +48,14 @@ $lang->product->build = '版本列表';
$lang->product->projectInfo = "所有與此產品關聯的{$lang->projectCommon}";
$lang->product->currentProject = '當前' . $lang->projectCommon;
-$lang->product->activeStories = "激活{$lang->storyCommon}";
-$lang->product->activeStoriesTitle = "激活{$lang->storyCommon}";
-$lang->product->changedStories = "已變更{$lang->storyCommon}";
-$lang->product->changedStoriesTitle = "已變更{$lang->storyCommon}";
-$lang->product->draftStories = "草稿{$lang->storyCommon}";
-$lang->product->draftStoriesTitle = "草稿{$lang->storyCommon}";
-$lang->product->closedStories = "已關閉{$lang->storyCommon}";
-$lang->product->closedStoriesTitle = "已關閉{$lang->storyCommon}";
+$lang->product->activeStories = "激活{$lang->productSRCommon}";
+$lang->product->activeStoriesTitle = "激活{$lang->productSRCommon}";
+$lang->product->changedStories = "已變更{$lang->productSRCommon}";
+$lang->product->changedStoriesTitle = "已變更{$lang->productSRCommon}";
+$lang->product->draftStories = "草稿{$lang->productSRCommon}";
+$lang->product->draftStoriesTitle = "草稿{$lang->productSRCommon}";
+$lang->product->closedStories = "已關閉{$lang->productSRCommon}";
+$lang->product->closedStoriesTitle = "已關閉{$lang->productSRCommon}";
$lang->product->unResolvedBugs = '未解決Bug';
$lang->product->unResolvedBugsTitle = '未解決Bug';
$lang->product->assignToNullBugs = '未指派Bug';
diff --git a/module/product/model.php b/module/product/model.php
index 30dc6b22c6..45fe6f956d 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1172,11 +1172,11 @@ class productModel extends model
$cases = $this->dao->select('story')->from(TABLE_CASE)->where('story')->in($storyIdList)->andWhere('deleted')->eq(0)->fetchAll('story');
$rate = count($stories) == 0 || $rateCount == 0 ? 0 : round(count($cases) / $rateCount, 2);
- $storyCommon = $this->lang->storyCommon;
+ $storyCommon = $this->lang->productSRCommon;
if($this->config->URAndSR)
{
- if($storyType == 'requirement') $storyCommon = $this->lang->URCommon;
- if($storyType == 'story') $storyCommon = $this->lang->SRCommon;
+ if($storyType == 'requirement') $storyCommon = $this->lang->productURCommon;
+ if($storyType == 'story') $storyCommon = $this->lang->productSRCommon;
}
return sprintf($this->lang->product->storySummary, $allCount, $storyCommon, $totalEstimate, $rate * 100 . "%");
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 8ad5bf2d49..578bcf0a9a 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -441,14 +441,7 @@ $('#branch' + branchID).closest('li').addClass('active');
$(function()
{
// Update table summary text
- storyCommon;
- if($config->URAndSR)
- {
- if($storyType == 'requirement') $storyCommon = $lang->URCommon;
- if($storyType == 'story') $storyCommon = $lang->SRCommon;
- }
- ?>
+ productSRCommon;?>
var checkedSummary = 'product->checkedSummary)?>';
$('#productStoryForm').table(
{
diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php
index eda2c1a561..9ba92555e3 100644
--- a/module/productplan/lang/zh-cn.php
+++ b/module/productplan/lang/zh-cn.php
@@ -21,12 +21,12 @@ $lang->productplan->basicInfo = '基本信息';
$lang->productplan->batchEdit = '批量编辑';
$lang->productplan->batchUnlink = "批量移除";
-$lang->productplan->linkStory = "关联{$lang->storyCommon}";
-$lang->productplan->unlinkStory = "移除{$lang->storyCommon}";
+$lang->productplan->linkStory = "关联{$lang->productSRCommon}";
+$lang->productplan->unlinkStory = "移除{$lang->productSRCommon}";
$lang->productplan->unlinkStoryAB = "移除";
-$lang->productplan->batchUnlinkStory = "批量移除{$lang->storyCommon}";
-$lang->productplan->linkedStories = $lang->storyCommon;
-$lang->productplan->unlinkedStories = "未关联{$lang->storyCommon}";
+$lang->productplan->batchUnlinkStory = "批量移除{$lang->productSRCommon}";
+$lang->productplan->linkedStories = $lang->productSRCommon;
+$lang->productplan->unlinkedStories = "未关联{$lang->productSRCommon}";
$lang->productplan->updateOrder = '排序';
$lang->productplan->createChildren = "创建子{$lang->planCommon}";
@@ -39,7 +39,7 @@ $lang->productplan->unexpired = "未过期{$lang->planCommon}";
$lang->productplan->all = "所有{$lang->planCommon}";
$lang->productplan->confirmDelete = "您确认删除该{$lang->planCommon}吗？";
-$lang->productplan->confirmUnlinkStory = "您确认移除该{$lang->storyCommon}吗？";
+$lang->productplan->confirmUnlinkStory = "您确认移除该{$lang->productSRCommon}吗？";
$lang->productplan->confirmUnlinkBug = "您确认移除该Bug吗？";
$lang->productplan->noPlan = "暂时没有{$lang->planCommon}。";
$lang->productplan->cannotDeleteParent = "不能删除父{$lang->planCommon}";
@@ -53,7 +53,7 @@ $lang->productplan->begin = '开始日期';
$lang->productplan->end = '结束日期';
$lang->productplan->last = "上次{$lang->planCommon}";
$lang->productplan->future = '待定';
-$lang->productplan->stories = "{$lang->storyCommon}数";
+$lang->productplan->stories = "{$lang->productSRCommon}数";
$lang->productplan->bugs = 'Bug数';
$lang->productplan->hour = $lang->hourCommon;
$lang->productplan->project = $lang->projectCommon;
diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php
index 0648da2001..238af6fbea 100644
--- a/module/productplan/lang/zh-tw.php
+++ b/module/productplan/lang/zh-tw.php
@@ -21,12 +21,12 @@ $lang->productplan->basicInfo = '基本信息';
$lang->productplan->batchEdit = '批量編輯';
$lang->productplan->batchUnlink = "批量移除";
-$lang->productplan->linkStory = "關聯{$lang->storyCommon}";
-$lang->productplan->unlinkStory = "移除{$lang->storyCommon}";
+$lang->productplan->linkStory = "關聯{$lang->productSRCommon}";
+$lang->productplan->unlinkStory = "移除{$lang->productSRCommon}";
$lang->productplan->unlinkStoryAB = "移除";
-$lang->productplan->batchUnlinkStory = "批量移除{$lang->storyCommon}";
-$lang->productplan->linkedStories = $lang->storyCommon;
-$lang->productplan->unlinkedStories = "未關聯{$lang->storyCommon}";
+$lang->productplan->batchUnlinkStory = "批量移除{$lang->productSRCommon}";
+$lang->productplan->linkedStories = $lang->productSRCommon;
+$lang->productplan->unlinkedStories = "未關聯{$lang->productSRCommon}";
$lang->productplan->updateOrder = '排序';
$lang->productplan->createChildren = "創建子計劃";
@@ -39,7 +39,7 @@ $lang->productplan->unexpired = '未過期計劃';
$lang->productplan->all = '所有計劃';
$lang->productplan->confirmDelete = "您確認刪除該計劃嗎？";
-$lang->productplan->confirmUnlinkStory = "您確認移除該{$lang->storyCommon}嗎？";
+$lang->productplan->confirmUnlinkStory = "您確認移除該{$lang->productSRCommon}嗎？";
$lang->productplan->confirmUnlinkBug = "您確認移除該Bug嗎？";
$lang->productplan->noPlan = '暫時沒有計劃。';
$lang->productplan->cannotDeleteParent = '不能刪除父計劃';
@@ -53,7 +53,7 @@ $lang->productplan->begin = '開始日期';
$lang->productplan->end = '結束日期';
$lang->productplan->last = '上次計劃';
$lang->productplan->future = '待定';
-$lang->productplan->stories = "{$lang->storyCommon}數";
+$lang->productplan->stories = "{$lang->productSRCommon}數";
$lang->productplan->bugs = 'Bug數';
$lang->productplan->hour = $lang->hourCommon;
$lang->productplan->project = $lang->projectCommon;
diff --git a/module/program/control.php b/module/program/control.php
index 5e8c8d9d61..43fc147b2f 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -691,6 +691,7 @@ class program extends control
*/
public function PRJCreate($model = 'waterfall', $programID = 0, $from = 'PRJ', $copyProjectID = '', $projectID = 0)
{
+ $this->app->loadLang('custom');
if($from == 'PRJ')
{
$this->lang->navGroup->program = 'project';
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index 90671554d1..cc9f6ab235 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -29,6 +29,7 @@ $lang->program->PRJUpdateOrder = '排序';
$lang->program->PRJSort = '项目排序';
$lang->program->PRJWhitelist = '项目白名单';
$lang->program->PRJAddWhitelist = '项目添加白名单';
+$lang->program->PRJStoryConcept = '需求概念组合';
$lang->program->unbindWhielist = '项目删除白名单';
$lang->program->PRJManageProducts = '关联产品';
$lang->program->copyTitle = '请选择一个项目来复制';
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index d33e6c1a9e..e32e0beae4 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -62,7 +62,7 @@ $lang->project->createStory = "Story erstellen";
$lang->project->all = 'Alle';
$lang->project->undone = 'Unabgeschlossen ';
$lang->project->unclosed = 'Geschlossen';
-$lang->project->typeDesc = "Keine {$lang->storyCommon}, Bug, Build, Testaufgabe oder ist bei OPS erlaubt";
+$lang->project->typeDesc = "Keine {$lang->productSRCommon}, Bug, Build, Testaufgabe oder ist bei OPS erlaubt";
$lang->project->mine = 'Meine Zuständigkeit: ';
$lang->project->other = 'Andere:';
$lang->project->deleted = 'Gelöscht';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index bea9380e0b..f4baa5196a 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -62,7 +62,7 @@ $lang->project->createStory = "Create Story";
$lang->project->all = "All {$lang->projectCommon}s";
$lang->project->undone = 'Unfinished ';
$lang->project->unclosed = 'Unclosed';
-$lang->project->typeDesc = "OPS {$lang->projectCommon} has no {$lang->storyCommon}, Bug, Build, or Test features.";
+$lang->project->typeDesc = "OPS {$lang->projectCommon} has no {$lang->productSRCommon}, Bug, Build, or Test features.";
$lang->project->mine = 'Mine: ';
$lang->project->other = 'Others:';
$lang->project->deleted = 'Deleted';
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index d1f507d394..58d0295464 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -62,7 +62,7 @@ $lang->project->createStory = "Créer une Story";
$lang->project->all = "Tous les {$lang->projectCommon}s";
$lang->project->undone = 'Non Terminé';
$lang->project->unclosed = 'Non Fermées';
-$lang->project->typeDesc = "Aucune {$lang->storyCommon}, bug, build, test, ou graphe d'atterrissage n'est disponible";
+$lang->project->typeDesc = "Aucune {$lang->productSRCommon}, bug, build, test, ou graphe d'atterrissage n'est disponible";
$lang->project->mine = 'A Moi: ';
$lang->project->other = 'Autres:';
$lang->project->deleted = 'Supprimé';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index a7f60e3ed3..cf7abcf7f5 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -58,11 +58,11 @@ $lang->project->progress = '进度';
$lang->project->hours = '预计 %s 消耗 %s 剩余 %s';
$lang->project->viewBug = '查看bug';
$lang->project->noProduct = "无{$lang->productCommon}{$lang->projectCommon}";
-$lang->project->createStory = "添加{$lang->storyCommon}";
+$lang->project->createStory = "添加{$lang->productSRCommon}";
$lang->project->all = '所有';
$lang->project->undone = '未完成';
$lang->project->unclosed = '未关闭';
-$lang->project->typeDesc = "运维{$lang->projectCommon}没有{$lang->storyCommon}、bug、版本、测试功能。";
+$lang->project->typeDesc = "运维{$lang->projectCommon}没有{$lang->productSRCommon}、bug、版本、测试功能。";
$lang->project->mine = '我负责：';
$lang->project->other = '其他：';
$lang->project->deleted = '已删除';
@@ -126,7 +126,7 @@ $lang->project->burnByList['storyPoint'] = '按故事点查看';
$lang->project->index = "{$lang->projectCommon}主页";
$lang->project->task = '任务列表';
$lang->project->groupTask = '分组浏览任务';
-$lang->project->story = "{$lang->storyCommon}列表";
+$lang->project->story = "{$lang->productSRCommon}列表";
$lang->project->bug = 'Bug列表';
$lang->project->dynamic = '动态';
$lang->project->latestDynamic = '最新动态';
@@ -140,10 +140,10 @@ $lang->project->team = '团队成员';
$lang->project->doc = '文档列表';
$lang->project->doclib = '文档库列表';
$lang->project->manageProducts = '关联' . $lang->productCommon;
-$lang->project->linkStory = "关联{$lang->storyCommon}";
+$lang->project->linkStory = "关联{$lang->productSRCommon}";
$lang->project->linkStoryByPlan = "按照{$lang->planCommon}关联";
$lang->project->linkPlan = "关联{$lang->planCommon}";
-$lang->project->unlinkStoryTasks = "未关联{$lang->storyCommon}任务";
+$lang->project->unlinkStoryTasks = "未关联{$lang->productSRCommon}任务";
$lang->project->linkedProducts = '已关联';
$lang->project->unlinkedProducts = '未关联';
$lang->project->view = "{$lang->projectCommon}概况";
@@ -167,21 +167,21 @@ $lang->project->edit = "编辑{$lang->projectCommon}";
$lang->project->batchEdit = "批量编辑";
$lang->project->manageMembers = '团队管理';
$lang->project->unlinkMember = '移除成员';
-$lang->project->unlinkStory = "移除{$lang->storyCommon}";
-$lang->project->unlinkStoryAB = "移除{$lang->storyCommon}";
-$lang->project->batchUnlinkStory = "批量移除{$lang->storyCommon}";
+$lang->project->unlinkStory = "移除{$lang->productSRCommon}";
+$lang->project->unlinkStoryAB = "移除{$lang->productSRCommon}";
+$lang->project->batchUnlinkStory = "批量移除{$lang->productSRCommon}";
$lang->project->importTask = '转入任务';
-$lang->project->importPlanStories = "按{$lang->planCommon}关联{$lang->storyCommon}";
+$lang->project->importPlanStories = "按{$lang->planCommon}关联{$lang->productSRCommon}";
$lang->project->importBug = '导入Bug';
$lang->project->updateOrder = "{$lang->projectCommon}排序";
$lang->project->tree = '树状图';
$lang->project->treeTask = '只看任务';
-$lang->project->treeStory = "只看{$lang->storyCommon}";
+$lang->project->treeStory = "只看{$lang->productSRCommon}";
$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->planCommon . '关联的相关' . $lang->storyCommon . '？';
+$lang->project->treeOnlyStory = "树状图只看{$lang->productSRCommon}";
+$lang->project->storyKanban = "{$lang->productSRCommon}看板";
+$lang->project->storySort = "{$lang->productSRCommon}排序";
+$lang->project->importPlanStory = '创建' . $lang->projectCommon . '成功！\n是否导入' . $lang->planCommon . '关联的相关' . $lang->productSRCommon . '？';
$lang->project->iteration = '版本迭代';
$lang->project->iterationInfo = '迭代%s次';
$lang->project->viewAll = '查看所有';
@@ -201,7 +201,7 @@ $lang->project->statusSelects['closed'] = '已关闭';
$lang->project->statusSelects['cancel'] = '已取消';
$lang->project->groups[''] = '分组查看';
-$lang->project->groups['story'] = "{$lang->storyCommon}分组";
+$lang->project->groups['story'] = "{$lang->productSRCommon}分组";
$lang->project->groups['status'] = '状态分组';
$lang->project->groups['pri'] = '优先级分组';
$lang->project->groups['assignedTo'] = '指派给分组';
@@ -210,7 +210,7 @@ $lang->project->groups['closedBy'] = '关闭者分组';
$lang->project->groups['type'] = '类型分组';
$lang->project->groupFilter['story']['all'] = '所有';
-$lang->project->groupFilter['story']['linked'] = "已关联{$lang->storyCommon}的任务";
+$lang->project->groupFilter['story']['linked'] = "已关联{$lang->productSRCommon}的任务";
$lang->project->groupFilter['pri']['all'] = '所有';
$lang->project->groupFilter['pri']['noset'] = '未设置';
$lang->project->groupFilter['assignedTo']['undone'] = '未完成';
@@ -224,7 +224,7 @@ $lang->project->aboveAllProduct = "以上所有{$lang->productCommon}";
$lang->project->aboveAllProject = "以上所有{$lang->projectCommon}";
/* 页面提示。*/
-$lang->project->linkStoryByPlanTips = "此操作会将所选{$lang->planCommon}下面的{$lang->storyCommon}全部关联到此{$lang->projectCommon}中";
+$lang->project->linkStoryByPlanTips = "此操作会将所选{$lang->planCommon}下面的{$lang->productSRCommon}全部关联到此{$lang->projectCommon}中";
$lang->project->selectProject = "请选择{$lang->projectCommon}";
$lang->project->beginAndEnd = '起止时间';
$lang->project->begin = '开始日期';
@@ -242,9 +242,9 @@ $lang->project->groupSummaryAB = "总任务
%s : project->wbs = "分解任务";
$lang->project->batchWBS = "批量分解";
$lang->project->howToUpdateBurn = "帮助 ";
-$lang->project->whyNoStories = "看起来没有{$lang->storyCommon}可以关联。请检查下{$lang->projectCommon}关联的{$lang->productCommon}中有没有{$lang->storyCommon}，而且要确保它们已经审核通过。";
-$lang->project->productStories = "{$lang->projectCommon}关联的{$lang->storyCommon}是{$lang->productCommon}{$lang->storyCommon}的子集，并且只有评审通过的{$lang->storyCommon}才能关联。请关联{$lang->storyCommon}。";
-$lang->project->haveDraft = "有%s条草稿状态的{$lang->storyCommon}无法关联到该{$lang->projectCommon}";
+$lang->project->whyNoStories = "看起来没有{$lang->productSRCommon}可以关联。请检查下{$lang->projectCommon}关联的{$lang->productCommon}中有没有{$lang->productSRCommon}，而且要确保它们已经审核通过。";
+$lang->project->productStories = "{$lang->projectCommon}关联的{$lang->productSRCommon}是{$lang->productCommon}{$lang->productSRCommon}的子集，并且只有评审通过的{$lang->productSRCommon}才能关联。请关联{$lang->productSRCommon}。";
+$lang->project->haveDraft = "有%s条草稿状态的{$lang->productSRCommon}无法关联到该{$lang->projectCommon}";
$lang->project->doneProjects = '已结束';
$lang->project->selectDept = '选择部门';
$lang->project->selectDeptTitle = '选择一个部门的成员';
@@ -264,14 +264,14 @@ $lang->project->noMembers = '暂时没有团队成员。';
/* 交互提示。*/
$lang->project->confirmDelete = "您确定删除{$lang->projectCommon}[%s]吗？";
$lang->project->confirmUnlinkMember = "您确定从该{$lang->projectCommon}中移除该用户吗？";
-$lang->project->confirmUnlinkStory = "您确定从该{$lang->projectCommon}中移除该{$lang->storyCommon}吗？";
+$lang->project->confirmUnlinkStory = "您确定从该{$lang->projectCommon}中移除该{$lang->productSRCommon}吗？";
$lang->project->errorNoLinkedProducts = "该{$lang->projectCommon}没有关联的{$lang->productCommon}，系统将转到{$lang->productCommon}关联页面";
$lang->project->errorSameProducts = "{$lang->projectCommon}不能关联多个相同的{$lang->productCommon}。";
$lang->project->accessDenied = "您无权访问该{$lang->projectCommon}！";
$lang->project->tips = '提示';
$lang->project->afterInfo = "{$lang->projectCommon}添加成功，您现在可以进行以下操作：";
$lang->project->setTeam = '设置团队';
-$lang->project->linkStory = "关联{$lang->storyCommon}";
+$lang->project->linkStory = "关联{$lang->productSRCommon}";
$lang->project->createTask = '创建任务';
$lang->project->goback = "返回任务列表";
$lang->project->noweekend = '去除周末';
@@ -310,12 +310,12 @@ $lang->project->placeholder->totalLeft = "{$lang->projectCommon}开始时的总
$lang->project->selectGroup = new stdclass();
$lang->project->selectGroup->done = '(已结束)';
-$lang->project->orderList['order_asc'] = "{$lang->storyCommon}排序正序";
-$lang->project->orderList['order_desc'] = "{$lang->storyCommon}排序倒序";
-$lang->project->orderList['pri_asc'] = "{$lang->storyCommon}优先级正序";
-$lang->project->orderList['pri_desc'] = "{$lang->storyCommon}优先级倒序";
-$lang->project->orderList['stage_asc'] = "{$lang->storyCommon}阶段正序";
-$lang->project->orderList['stage_desc'] = "{$lang->storyCommon}阶段倒序";
+$lang->project->orderList['order_asc'] = "{$lang->productSRCommon}排序正序";
+$lang->project->orderList['order_desc'] = "{$lang->productSRCommon}排序倒序";
+$lang->project->orderList['pri_asc'] = "{$lang->productSRCommon}优先级正序";
+$lang->project->orderList['pri_desc'] = "{$lang->productSRCommon}优先级倒序";
+$lang->project->orderList['stage_asc'] = "{$lang->productSRCommon}阶段正序";
+$lang->project->orderList['stage_desc'] = "{$lang->productSRCommon}阶段倒序";
$lang->project->kanban = "看板";
$lang->project->kanbanSetting = "看板设置";
@@ -352,7 +352,7 @@ $lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed;
$lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe;
$lang->project->featureBar['task']['myinvolved'] = $lang->project->myInvolved;
$lang->project->featureBar['task']['delayed'] = '已延期';
-$lang->project->featureBar['task']['needconfirm'] = "{$lang->storyCommon}变更";
+$lang->project->featureBar['task']['needconfirm'] = "{$lang->productSRCommon}变更";
$lang->project->featureBar['task']['status'] = $lang->project->statusSelects[''];
$lang->project->featureBar['all']['all'] = $lang->project->all;
@@ -366,4 +366,4 @@ $lang->project->treeLevel = array();
$lang->project->treeLevel['all'] = '全部展开';
$lang->project->treeLevel['root'] = '全部折叠';
$lang->project->treeLevel['task'] = '全部显示';
-$lang->project->treeLevel['story'] = "只看{$lang->storyCommon}";
+$lang->project->treeLevel['story'] = "只看{$lang->productSRCommon}";
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index 8483df2cda..1e03c6e303 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -58,11 +58,11 @@ $lang->project->progress = '進度';
$lang->project->hours = '預計 %s 消耗 %s 剩餘 %s';
$lang->project->viewBug = '查看bug';
$lang->project->noProduct = "無{$lang->productCommon}{$lang->projectCommon}";
-$lang->project->createStory = "添加{$lang->storyCommon}";
+$lang->project->createStory = "添加{$lang->productSRCommon}";
$lang->project->all = '所有';
$lang->project->undone = '未完成';
$lang->project->unclosed = '未關閉';
-$lang->project->typeDesc = "運維{$lang->projectCommon}沒有{$lang->storyCommon}、bug、版本、測試功能。";
+$lang->project->typeDesc = "運維{$lang->projectCommon}沒有{$lang->productSRCommon}、bug、版本、測試功能。";
$lang->project->mine = '我負責：';
$lang->project->other = '其他：';
$lang->project->deleted = '已刪除';
@@ -126,7 +126,7 @@ $lang->project->burnByList['storyPoint'] = '按故事點查看';
$lang->project->index = "{$lang->projectCommon}主頁";
$lang->project->task = '任務列表';
$lang->project->groupTask = '分組瀏覽任務';
-$lang->project->story = "{$lang->storyCommon}列表";
+$lang->project->story = "{$lang->productSRCommon}列表";
$lang->project->bug = 'Bug列表';
$lang->project->dynamic = '動態';
$lang->project->latestDynamic = '最新動態';
@@ -140,10 +140,10 @@ $lang->project->team = '團隊成員';
$lang->project->doc = '文檔列表';
$lang->project->doclib = '文檔庫列表';
$lang->project->manageProducts = '關聯' . $lang->productCommon;
-$lang->project->linkStory = "關聯{$lang->storyCommon}";
+$lang->project->linkStory = "關聯{$lang->productSRCommon}";
$lang->project->linkStoryByPlan = '按照計劃關聯';
$lang->project->linkPlan = '關聯計劃';
-$lang->project->unlinkStoryTasks = "未關聯{$lang->storyCommon}任務";
+$lang->project->unlinkStoryTasks = "未關聯{$lang->productSRCommon}任務";
$lang->project->linkedProducts = '已關聯';
$lang->project->unlinkedProducts = '未關聯';
$lang->project->view = "{$lang->projectCommon}概況";
@@ -167,21 +167,21 @@ $lang->project->edit = "編輯{$lang->projectCommon}";
$lang->project->batchEdit = "批量編輯";
$lang->project->manageMembers = '團隊管理';
$lang->project->unlinkMember = '移除成員';
-$lang->project->unlinkStory = "移除{$lang->storyCommon}";
-$lang->project->unlinkStoryAB = "移除{$lang->storyCommon}";
-$lang->project->batchUnlinkStory = "批量移除{$lang->storyCommon}";
+$lang->project->unlinkStory = "移除{$lang->productSRCommon}";
+$lang->project->unlinkStoryAB = "移除{$lang->productSRCommon}";
+$lang->project->batchUnlinkStory = "批量移除{$lang->productSRCommon}";
$lang->project->importTask = '轉入任務';
-$lang->project->importPlanStories = "按計劃關聯{$lang->storyCommon}";
+$lang->project->importPlanStories = "按計劃關聯{$lang->productSRCommon}";
$lang->project->importBug = '導入Bug';
$lang->project->updateOrder = "{$lang->projectCommon}排序";
$lang->project->tree = '樹狀圖';
$lang->project->treeTask = '只看任務';
-$lang->project->treeStory = "只看{$lang->storyCommon}";
+$lang->project->treeStory = "只看{$lang->productSRCommon}";
$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->treeOnlyStory = "樹狀圖只看{$lang->productSRCommon}";
+$lang->project->storyKanban = "{$lang->productSRCommon}看板";
+$lang->project->storySort = "{$lang->productSRCommon}排序";
+$lang->project->importPlanStory = '創建' . $lang->projectCommon . '成功！\n是否導入計劃關聯的相關' . $lang->productSRCommon . '？';
$lang->project->iteration = '版本迭代';
$lang->project->iterationInfo = '迭代%s次';
$lang->project->viewAll = '查看所有';
@@ -201,7 +201,7 @@ $lang->project->statusSelects['closed'] = '已關閉';
$lang->project->statusSelects['cancel'] = '已取消';
$lang->project->groups[''] = '分組查看';
-$lang->project->groups['story'] = "{$lang->storyCommon}分組";
+$lang->project->groups['story'] = "{$lang->productSRCommon}分組";
$lang->project->groups['status'] = '狀態分組';
$lang->project->groups['pri'] = '優先順序分組';
$lang->project->groups['assignedTo'] = '指派給分組';
@@ -210,7 +210,7 @@ $lang->project->groups['closedBy'] = '關閉者分組';
$lang->project->groups['type'] = '類型分組';
$lang->project->groupFilter['story']['all'] = '所有';
-$lang->project->groupFilter['story']['linked'] = "已關聯{$lang->storyCommon}的任務";
+$lang->project->groupFilter['story']['linked'] = "已關聯{$lang->productSRCommon}的任務";
$lang->project->groupFilter['pri']['all'] = '所有';
$lang->project->groupFilter['pri']['noset'] = '未設置';
$lang->project->groupFilter['assignedTo']['undone'] = '未完成';
@@ -224,7 +224,7 @@ $lang->project->aboveAllProduct = "以上所有{$lang->productCommon}";
$lang->project->aboveAllProject = "以上所有{$lang->projectCommon}";
/* 頁面提示。*/
-$lang->project->linkStoryByPlanTips = "此操作會將所選計划下面的{$lang->storyCommon}全部關聯到此{$lang->projectCommon}中";
+$lang->project->linkStoryByPlanTips = "此操作會將所選計划下面的{$lang->productSRCommon}全部關聯到此{$lang->projectCommon}中";
$lang->project->selectProject = "請選擇{$lang->projectCommon}";
$lang->project->beginAndEnd = '起止時間';
$lang->project->begin = '開始日期';
@@ -242,9 +242,9 @@ $lang->project->groupSummaryAB = "總任務
%s : project->wbs = "分解任務";
$lang->project->batchWBS = "批量分解";
$lang->project->howToUpdateBurn = "幫助 ";
-$lang->project->whyNoStories = "看起來沒有{$lang->storyCommon}可以關聯。請檢查下{$lang->projectCommon}關聯的{$lang->productCommon}中有沒有{$lang->storyCommon}，而且要確保它們已經審核通過。";
-$lang->project->productStories = "{$lang->projectCommon}關聯的{$lang->storyCommon}是{$lang->productCommon}{$lang->storyCommon}的子集，並且只有評審通過的{$lang->storyCommon}才能關聯。請關聯{$lang->storyCommon}。";
-$lang->project->haveDraft = "有%s條草稿狀態的{$lang->storyCommon}無法關聯到該{$lang->projectCommon}";
+$lang->project->whyNoStories = "看起來沒有{$lang->productSRCommon}可以關聯。請檢查下{$lang->projectCommon}關聯的{$lang->productCommon}中有沒有{$lang->productSRCommon}，而且要確保它們已經審核通過。";
+$lang->project->productStories = "{$lang->projectCommon}關聯的{$lang->productSRCommon}是{$lang->productCommon}{$lang->productSRCommon}的子集，並且只有評審通過的{$lang->productSRCommon}才能關聯。請關聯{$lang->productSRCommon}。";
+$lang->project->haveDraft = "有%s條草稿狀態的{$lang->productSRCommon}無法關聯到該{$lang->projectCommon}";
$lang->project->doneProjects = '已結束';
$lang->project->selectDept = '選擇部門';
$lang->project->selectDeptTitle = '選擇一個部門的成員';
@@ -264,14 +264,14 @@ $lang->project->noMembers = '暫時沒有團隊成員。';
/* 交互提示。*/
$lang->project->confirmDelete = "您確定刪除{$lang->projectCommon}[%s]嗎？";
$lang->project->confirmUnlinkMember = "您確定從該{$lang->projectCommon}中移除該用戶嗎？";
-$lang->project->confirmUnlinkStory = "您確定從該{$lang->projectCommon}中移除該{$lang->storyCommon}嗎？";
+$lang->project->confirmUnlinkStory = "您確定從該{$lang->projectCommon}中移除該{$lang->productSRCommon}嗎？";
$lang->project->errorNoLinkedProducts = "該{$lang->projectCommon}沒有關聯的{$lang->productCommon}，系統將轉到{$lang->productCommon}關聯頁面";
$lang->project->errorSameProducts = "{$lang->projectCommon}不能關聯多個相同的{$lang->productCommon}。";
$lang->project->accessDenied = "您無權訪問該{$lang->projectCommon}！";
$lang->project->tips = '提示';
$lang->project->afterInfo = "{$lang->projectCommon}添加成功，您現在可以進行以下操作：";
$lang->project->setTeam = '設置團隊';
-$lang->project->linkStory = "關聯{$lang->storyCommon}";
+$lang->project->linkStory = "關聯{$lang->productSRCommon}";
$lang->project->createTask = '創建任務';
$lang->project->goback = "返回任務列表";
$lang->project->noweekend = '去除周末';
@@ -310,12 +310,12 @@ $lang->project->placeholder->totalLeft = "{$lang->projectCommon}開始時的總
$lang->project->selectGroup = new stdclass();
$lang->project->selectGroup->done = '(已結束)';
-$lang->project->orderList['order_asc'] = "{$lang->storyCommon}排序正序";
-$lang->project->orderList['order_desc'] = "{$lang->storyCommon}排序倒序";
-$lang->project->orderList['pri_asc'] = "{$lang->storyCommon}優先順序正序";
-$lang->project->orderList['pri_desc'] = "{$lang->storyCommon}優先順序倒序";
-$lang->project->orderList['stage_asc'] = "{$lang->storyCommon}階段正序";
-$lang->project->orderList['stage_desc'] = "{$lang->storyCommon}階段倒序";
+$lang->project->orderList['order_asc'] = "{$lang->productSRCommon}排序正序";
+$lang->project->orderList['order_desc'] = "{$lang->productSRCommon}排序倒序";
+$lang->project->orderList['pri_asc'] = "{$lang->productSRCommon}優先順序正序";
+$lang->project->orderList['pri_desc'] = "{$lang->productSRCommon}優先順序倒序";
+$lang->project->orderList['stage_asc'] = "{$lang->productSRCommon}階段正序";
+$lang->project->orderList['stage_desc'] = "{$lang->productSRCommon}階段倒序";
$lang->project->kanban = "看板";
$lang->project->kanbanSetting = "看板設置";
@@ -352,7 +352,7 @@ $lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed;
$lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe;
$lang->project->featureBar['task']['myinvolved'] = $lang->project->myInvolved;
$lang->project->featureBar['task']['delayed'] = '已延期';
-$lang->project->featureBar['task']['needconfirm'] = "{$lang->storyCommon}變更";
+$lang->project->featureBar['task']['needconfirm'] = "{$lang->productSRCommon}變更";
$lang->project->featureBar['task']['status'] = $lang->project->statusSelects[''];
$lang->project->featureBar['all']['all'] = $lang->project->all;
@@ -366,4 +366,4 @@ $lang->project->treeLevel = array();
$lang->project->treeLevel['all'] = '全部展開';
$lang->project->treeLevel['root'] = '全部摺疊';
$lang->project->treeLevel['task'] = '全部顯示';
-$lang->project->treeLevel['story'] = "只看{$lang->storyCommon}";
+$lang->project->treeLevel['story'] = "只看{$lang->productSRCommon}";
diff --git a/module/project/model.php b/module/project/model.php
index 78e1d8be1a..8e738f84dd 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1496,7 +1496,7 @@ class projectModel extends model
*/
public function getOrderedExecutions($projectID, $status, $num = 0)
{
- $executionList = $this->getExecutionList($projectID, $status);
+ $executionList = $this->getExecutionList($projectID, 'all', $status);
if(empty($executionIdList)) return $executionList;
$executions = $mineExecutions = $otherExecutions = $closedExecutions = array();
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index b36e1d19e5..7b09faa400 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -356,10 +356,7 @@
$(function()
{
// Update table summary text
- storyCommon;
- if(!empty($config->URAndSR)) $storyCommon = $lang->SRCommon;
- ?>
+ projectSRCommon;?>
var checkedSummary = 'product->checkedSummary)?>';
$('#projectStoryForm').table(
{
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index c2b820c35e..5614cfd952 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -12,7 +12,7 @@
$lang->release->common = '发布';
$lang->release->create = "创建发布";
$lang->release->edit = "编辑发布";
-$lang->release->linkStory = "关联{$lang->storyCommon}";
+$lang->release->linkStory = "关联{$lang->productSRCommon}";
$lang->release->linkBug = "关联Bug";
$lang->release->delete = "删除发布";
$lang->release->deleted = '已删除';
@@ -20,11 +20,11 @@ $lang->release->view = "发布详情";
$lang->release->browse = "浏览发布";
$lang->release->changeStatus = "修改状态";
$lang->release->batchUnlink = "批量移除";
-$lang->release->batchUnlinkStory = "批量移除{$lang->storyCommon}";
+$lang->release->batchUnlinkStory = "批量移除{$lang->productSRCommon}";
$lang->release->batchUnlinkBug = "批量移除Bug";
$lang->release->confirmDelete = "您确认删除该发布吗？";
-$lang->release->confirmUnlinkStory = "您确认移除该{$lang->storyCommon}吗？";
+$lang->release->confirmUnlinkStory = "您确认移除该{$lang->productSRCommon}吗？";
$lang->release->confirmUnlinkBug = "您确认移除该Bug吗？";
$lang->release->existBuild = '『版本』已经有『%s』这条记录了。您可以更改『发布名称』或者选择一个『版本』。';
$lang->release->noRelease = '暂时没有发布。';
@@ -43,13 +43,13 @@ $lang->release->desc = '描述';
$lang->release->status = '状态';
$lang->release->subStatus = '子状态';
$lang->release->last = '上次发布';
-$lang->release->unlinkStory = "移除{$lang->storyCommon}";
+$lang->release->unlinkStory = "移除{$lang->productSRCommon}";
$lang->release->unlinkBug = '移除Bug';
-$lang->release->stories = "完成的{$lang->storyCommon}";
+$lang->release->stories = "完成的{$lang->productSRCommon}";
$lang->release->bugs = '解决的Bug';
$lang->release->leftBugs = '遗留的Bug';
$lang->release->generatedBugs = '遗留的Bug';
-$lang->release->finishStories = "本次共完成 %s 个{$lang->storyCommon}";
+$lang->release->finishStories = "本次共完成 %s 个{$lang->productSRCommon}";
$lang->release->resolvedBugs = '本次共解决 %s 个Bug';
$lang->release->createdBugs = '本次共遗留 %s 个Bug';
$lang->release->export = '导出HTML';
@@ -60,7 +60,7 @@ $lang->release->filePath = '下载地址：';
$lang->release->scmPath = '版本库地址：';
$lang->release->exportTypeList['all'] = '所有';
-$lang->release->exportTypeList['story'] = $lang->storyCommon;
+$lang->release->exportTypeList['story'] = $lang->productSRCommon;
$lang->release->exportTypeList['bug'] = 'Bug';
$lang->release->exportTypeList['leftbug'] = '遗留Bug';
diff --git a/module/release/lang/zh-tw.php b/module/release/lang/zh-tw.php
index f5017b7e64..646bfe4052 100644
--- a/module/release/lang/zh-tw.php
+++ b/module/release/lang/zh-tw.php
@@ -12,7 +12,7 @@
$lang->release->common = '發佈';
$lang->release->create = "創建發佈";
$lang->release->edit = "編輯發佈";
-$lang->release->linkStory = "關聯{$lang->storyCommon}";
+$lang->release->linkStory = "關聯{$lang->productSRCommon}";
$lang->release->linkBug = "關聯Bug";
$lang->release->delete = "刪除發佈";
$lang->release->deleted = '已刪除';
@@ -20,11 +20,11 @@ $lang->release->view = "發佈詳情";
$lang->release->browse = "瀏覽發佈";
$lang->release->changeStatus = "修改狀態";
$lang->release->batchUnlink = "批量移除";
-$lang->release->batchUnlinkStory = "批量移除{$lang->storyCommon}";
+$lang->release->batchUnlinkStory = "批量移除{$lang->productSRCommon}";
$lang->release->batchUnlinkBug = "批量移除Bug";
$lang->release->confirmDelete = "您確認刪除該發佈嗎？";
-$lang->release->confirmUnlinkStory = "您確認移除該{$lang->storyCommon}嗎？";
+$lang->release->confirmUnlinkStory = "您確認移除該{$lang->productSRCommon}嗎？";
$lang->release->confirmUnlinkBug = "您確認移除該Bug嗎？";
$lang->release->existBuild = '『版本』已經有『%s』這條記錄了。您可以更改『發佈名稱』或者選擇一個『版本』。';
$lang->release->noRelease = '暫時沒有發佈。';
@@ -43,13 +43,13 @@ $lang->release->desc = '描述';
$lang->release->status = '狀態';
$lang->release->subStatus = '子狀態';
$lang->release->last = '上次發佈';
-$lang->release->unlinkStory = "移除{$lang->storyCommon}";
+$lang->release->unlinkStory = "移除{$lang->productSRCommon}";
$lang->release->unlinkBug = '移除Bug';
-$lang->release->stories = "完成的{$lang->storyCommon}";
+$lang->release->stories = "完成的{$lang->productSRCommon}";
$lang->release->bugs = '解決的Bug';
$lang->release->leftBugs = '遺留的Bug';
$lang->release->generatedBugs = '遺留的Bug';
-$lang->release->finishStories = "本次共完成 %s 個{$lang->storyCommon}";
+$lang->release->finishStories = "本次共完成 %s 個{$lang->productSRCommon}";
$lang->release->resolvedBugs = '本次共解決 %s 個Bug';
$lang->release->createdBugs = '本次共遺留 %s 個Bug';
$lang->release->export = '導出HTML';
@@ -60,7 +60,7 @@ $lang->release->filePath = '下載地址：';
$lang->release->scmPath = '版本庫地址：';
$lang->release->exportTypeList['all'] = '所有';
-$lang->release->exportTypeList['story'] = $lang->storyCommon;
+$lang->release->exportTypeList['story'] = $lang->productSRCommon;
$lang->release->exportTypeList['bug'] = 'Bug';
$lang->release->exportTypeList['leftbug'] = '遺留Bug';
diff --git a/module/report/lang/en.php b/module/report/lang/en.php
index b727c76ef7..53aa7cf1a7 100644
--- a/module/report/lang/en.php
+++ b/module/report/lang/en.php
@@ -113,9 +113,9 @@ $lang->report->annualData->foundBugs = "Bug Reported";
$lang->report->annualData->createdCases = "Case Created";
$lang->report->annualData->involvedProducts = "{$lang->productCommon} Involved";
$lang->report->annualData->createdPlans = "Plan Created";
-$lang->report->annualData->createdStories = "{$lang->storyCommon} Created";
+$lang->report->annualData->createdStories = "{$lang->productSRCommon} Created";
-$lang->report->annualData->productOverview = "{$lang->productCommon} {$lang->storyCommon} Count and Percent";
+$lang->report->annualData->productOverview = "{$lang->productCommon} {$lang->productSRCommon} Count and Percent";
$lang->report->annualData->qaOverview = "{$lang->productCommon} Bug Count and Percent";
$lang->report->annualData->projectOverview = "{$lang->projectCommon} Overview";
$lang->report->annualData->doneProject = "Done {$lang->projectCommon}";
@@ -123,13 +123,13 @@ $lang->report->annualData->doingProject = "Ongoing {$lang->projectCommon}";
$lang->report->annualData->suspendProject = "Suspended {$lang->projectCommon}";
$lang->report->annualData->projectName = "{$lang->projectCommon}";
-$lang->report->annualData->finishedStory = "{$lang->storyCommon} Finished";
+$lang->report->annualData->finishedStory = "{$lang->productSRCommon} Finished";
$lang->report->annualData->finishedTask = 'Task Finished';
$lang->report->annualData->foundBug = 'Bug Reported';
$lang->report->annualData->resolvedBug = 'Bug Resolved';
$lang->report->annualData->productName = "{$lang->productCommon}";
$lang->report->annualData->planCount = 'Plan';
-$lang->report->annualData->storyCount = "{$lang->storyCommon}";
+$lang->report->annualData->storyCount = "{$lang->productSRCommon}";
$lang->report->annualData->qaData = "Bug Reported and Case Created";
$lang->report->annualData->totalCreatedBug = 'Bug Reported';
@@ -140,12 +140,12 @@ $lang->report->annualData->totalFinishedTask = 'Task Finished';
$lang->report->annualData->totalResolvedBug = 'Bug Resolved';
$lang->report->annualData->totalConsumed = 'Hour Cost';
-$lang->report->annualData->poData = "{$lang->storyCommon} Created, Priority and Status";
-$lang->report->annualData->totalStoryPri = "{$lang->storyCommon} Priority";
-$lang->report->annualData->totalStoryStage = "{$lang->storyCommon} Stage";
+$lang->report->annualData->poData = "{$lang->productSRCommon} Created, Priority and Status";
+$lang->report->annualData->totalStoryPri = "{$lang->productSRCommon} Priority";
+$lang->report->annualData->totalStoryStage = "{$lang->productSRCommon} Stage";
$lang->report->annualData->qaStatistics = "Monthly Created Bug and Case";
-$lang->report->annualData->poStatistics = "Monthly Created {$lang->storyCommon}";
+$lang->report->annualData->poStatistics = "Monthly Created {$lang->productSRCommon}";
$lang->report->annualData->devStatistics = "Monthly Finished Task, Hour, and Resolved Bug";
$lang->report->annualData->unit = " ";
diff --git a/module/report/lang/vi.php b/module/report/lang/vi.php
index 2b2a831d3e..513d54922d 100644
--- a/module/report/lang/vi.php
+++ b/module/report/lang/vi.php
@@ -113,9 +113,9 @@ $lang->report->annualData->foundBugs = "Bug được tạo";
$lang->report->annualData->createdCases = "Tình huống được tạo";
$lang->report->annualData->involvedProducts = "{$lang->productCommon} liên quan";
$lang->report->annualData->createdPlans = "Kế hoạch được tạo";
-$lang->report->annualData->createdStories = "{$lang->storyCommon} được tạo";
+$lang->report->annualData->createdStories = "{$lang->productSRCommon} được tạo";
-$lang->report->annualData->productOverview = "{$lang->productCommon} {$lang->storyCommon} số lượng và Phần trăm";
+$lang->report->annualData->productOverview = "{$lang->productCommon} {$lang->productSRCommon} số lượng và Phần trăm";
$lang->report->annualData->qaOverview = "Bug {$lang->productCommon} số lượng và Phần trăm";
$lang->report->annualData->projectOverview = "Tổng quan {$lang->projectCommon}";
$lang->report->annualData->doneProject = "{$lang->projectCommon} hoàn thành";
@@ -123,13 +123,13 @@ $lang->report->annualData->doingProject = "{$lang->projectCommon} đang thự
$lang->report->annualData->suspendProject = "{$lang->projectCommon} bị đình chỉ";
$lang->report->annualData->projectName = "{$lang->projectCommon}";
-$lang->report->annualData->finishedStory = "{$lang->storyCommon} kết thúc";
+$lang->report->annualData->finishedStory = "{$lang->productSRCommon} kết thúc";
$lang->report->annualData->finishedTask = 'Nhiệm vụ hoàn thành';
$lang->report->annualData->foundBug = 'Bug được báo cáo';
$lang->report->annualData->resolvedBug = 'Bug được giải quyết';
$lang->report->annualData->productName = "{$lang->productCommon}";
$lang->report->annualData->planCount = 'Kế hoạch';
-$lang->report->annualData->storyCount = "{$lang->storyCommon}";
+$lang->report->annualData->storyCount = "{$lang->productSRCommon}";
$lang->report->annualData->qaData = "Bug được tạo và Tình huống được tạo";
$lang->report->annualData->totalCreatedBug = 'Bug được báo cáo';
@@ -140,12 +140,12 @@ $lang->report->annualData->totalFinishedTask = 'Nhiệm vụ hoàn thành';
$lang->report->annualData->totalResolvedBug = 'Bug được giải quyết';
$lang->report->annualData->totalConsumed = 'Đã làm';
-$lang->report->annualData->poData = "{$lang->storyCommon} được tạo, Ưu tiên và tình trạng";
-$lang->report->annualData->totalStoryPri = "{$lang->storyCommon} Ưu tiên";
-$lang->report->annualData->totalStoryStage = "Giai đoạn {$lang->storyCommon}";
+$lang->report->annualData->poData = "{$lang->productSRCommon} được tạo, Ưu tiên và tình trạng";
+$lang->report->annualData->totalStoryPri = "{$lang->productSRCommon} Ưu tiên";
+$lang->report->annualData->totalStoryStage = "Giai đoạn {$lang->productSRCommon}";
$lang->report->annualData->qaStatistics = "Bug được tạo hàng tháng và Tình huống";
-$lang->report->annualData->poStatistics = "{$lang->storyCommon} được tạo hàng tháng";
+$lang->report->annualData->poStatistics = "{$lang->productSRCommon} được tạo hàng tháng";
$lang->report->annualData->devStatistics = "Nhiệm vụ hoàn thành háng tháng, giờ và Bug được giải quyết";
$lang->report->annualData->unit = " ";
diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php
index 1db78aa6c5..08d9cf05aa 100644
--- a/module/report/lang/zh-cn.php
+++ b/module/report/lang/zh-cn.php
@@ -113,9 +113,9 @@ $lang->report->annualData->foundBugs = "累计创建Bug数";
$lang->report->annualData->createdCases = "累计创建用例数";
$lang->report->annualData->involvedProducts = "累计参与{$lang->productCommon}数";
$lang->report->annualData->createdPlans = "累计创建{$lang->planCommon}数";
-$lang->report->annualData->createdStories = "累计创建{$lang->storyCommon}数";
+$lang->report->annualData->createdStories = "累计创建{$lang->productSRCommon}数";
-$lang->report->annualData->productOverview = "{$lang->productCommon}创建{$lang->storyCommon}数及占比";
+$lang->report->annualData->productOverview = "{$lang->productCommon}创建{$lang->productSRCommon}数及占比";
$lang->report->annualData->qaOverview = "{$lang->productCommon}创建Bug数及占比";
$lang->report->annualData->projectOverview = "参与{$lang->projectCommon}概览";
$lang->report->annualData->doneProject = "已完成的{$lang->projectCommon}";
@@ -123,13 +123,13 @@ $lang->report->annualData->doingProject = "正在进行的{$lang->projectComm
$lang->report->annualData->suspendProject = "已挂起的{$lang->projectCommon}";
$lang->report->annualData->projectName = "{$lang->projectCommon}名称";
-$lang->report->annualData->finishedStory = "完成{$lang->storyCommon}数";
+$lang->report->annualData->finishedStory = "完成{$lang->productSRCommon}数";
$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->storyCount = "{$lang->storyCommon}数";
+$lang->report->annualData->storyCount = "{$lang->productSRCommon}数";
$lang->report->annualData->qaData = "累计创建Bug数和创建用例数";
$lang->report->annualData->totalCreatedBug = '累计创建Bug数';
@@ -140,12 +140,12 @@ $lang->report->annualData->totalFinishedTask = '完成任务数';
$lang->report->annualData->totalResolvedBug = '解决Bug数';
$lang->report->annualData->totalConsumed = '累计工时';
-$lang->report->annualData->poData = "所创建{$lang->storyCommon}数和对应的优先级及状态";
-$lang->report->annualData->totalStoryPri = "创建{$lang->storyCommon}优先级分布";
-$lang->report->annualData->totalStoryStage = "创建{$lang->storyCommon}阶段分布";
+$lang->report->annualData->poData = "所创建{$lang->productSRCommon}数和对应的优先级及状态";
+$lang->report->annualData->totalStoryPri = "创建{$lang->productSRCommon}优先级分布";
+$lang->report->annualData->totalStoryStage = "创建{$lang->productSRCommon}阶段分布";
$lang->report->annualData->qaStatistics = "月创建Bug数和创建用例数";
-$lang->report->annualData->poStatistics = "月创建{$lang->storyCommon}数";
+$lang->report->annualData->poStatistics = "月创建{$lang->productSRCommon}数";
$lang->report->annualData->devStatistics = "月完成任务数及累计工时和解决Bug数";
$lang->report->annualData->unit = "个";
diff --git a/module/report/lang/zh-tw.php b/module/report/lang/zh-tw.php
index df836fd361..c513985a60 100644
--- a/module/report/lang/zh-tw.php
+++ b/module/report/lang/zh-tw.php
@@ -113,9 +113,9 @@ $lang->report->annualData->foundBugs = "累計創建Bug數";
$lang->report->annualData->createdCases = "累計創建用例數";
$lang->report->annualData->involvedProducts = "累計參與{$lang->productCommon}數";
$lang->report->annualData->createdPlans = "累計創建計劃數";
-$lang->report->annualData->createdStories = "累計創建{$lang->storyCommon}數";
+$lang->report->annualData->createdStories = "累計創建{$lang->productSRCommon}數";
-$lang->report->annualData->productOverview = "{$lang->productCommon}創建{$lang->storyCommon}數及占比";
+$lang->report->annualData->productOverview = "{$lang->productCommon}創建{$lang->productSRCommon}數及占比";
$lang->report->annualData->qaOverview = "{$lang->productCommon}創建Bug數及占比";
$lang->report->annualData->projectOverview = "參與{$lang->projectCommon}概覽";
$lang->report->annualData->doneProject = "已完成的{$lang->projectCommon}";
@@ -123,13 +123,13 @@ $lang->report->annualData->doingProject = "正在進行的{$lang->projectComm
$lang->report->annualData->suspendProject = "已掛起的{$lang->projectCommon}";
$lang->report->annualData->projectName = "{$lang->projectCommon}名稱";
-$lang->report->annualData->finishedStory = "完成{$lang->storyCommon}數";
+$lang->report->annualData->finishedStory = "完成{$lang->productSRCommon}數";
$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->storyCount = "{$lang->storyCommon}數";
+$lang->report->annualData->storyCount = "{$lang->productSRCommon}數";
$lang->report->annualData->qaData = "累計創建Bug數和創建用例數";
$lang->report->annualData->totalCreatedBug = '累計創建Bug數';
@@ -140,12 +140,12 @@ $lang->report->annualData->totalFinishedTask = '完成任務數';
$lang->report->annualData->totalResolvedBug = '解決Bug數';
$lang->report->annualData->totalConsumed = '累計工時';
-$lang->report->annualData->poData = "所創建{$lang->storyCommon}數和對應的優先順序及狀態";
-$lang->report->annualData->totalStoryPri = "創建{$lang->storyCommon}優先順序分佈";
-$lang->report->annualData->totalStoryStage = "創建{$lang->storyCommon}階段分佈";
+$lang->report->annualData->poData = "所創建{$lang->productSRCommon}數和對應的優先順序及狀態";
+$lang->report->annualData->totalStoryPri = "創建{$lang->productSRCommon}優先順序分佈";
+$lang->report->annualData->totalStoryStage = "創建{$lang->productSRCommon}階段分佈";
$lang->report->annualData->qaStatistics = "月創建Bug數和創建用例數";
-$lang->report->annualData->poStatistics = "月創建{$lang->storyCommon}數";
+$lang->report->annualData->poStatistics = "月創建{$lang->productSRCommon}數";
$lang->report->annualData->devStatistics = "月完成任務數及累計工時和解決Bug數";
$lang->report->annualData->unit = "個";
diff --git a/module/score/lang/zh-cn.php b/module/score/lang/zh-cn.php
index eef81db114..bf842d88f7 100644
--- a/module/score/lang/zh-cn.php
+++ b/module/score/lang/zh-cn.php
@@ -30,7 +30,7 @@ $lang->score->modules['user'] = '用户';
$lang->score->modules['ajax'] = '其它';
$lang->score->modules['doc'] = '文档';
$lang->score->modules['todo'] = '待办';
-$lang->score->modules['story'] = $lang->storyCommon;
+$lang->score->modules['story'] = $lang->productSRCommon;
$lang->score->modules['bug'] = 'Bug';
$lang->score->modules['testcase'] = '用例';
$lang->score->modules['testtask'] = '测试单';
@@ -62,8 +62,8 @@ $lang->score->methods['ajax']['batchEdit'] = '首次使用批量编辑
$lang->score->methods['ajax']['batchOther'] = '其它批量操作';
$lang->score->methods['doc']['create'] = '创建文档';
$lang->score->methods['todo']['create'] = '创建待办';
-$lang->score->methods['story']['create'] = "创建{$lang->storyCommon}";
-$lang->score->methods['story']['close'] = "{$lang->storyCommon}关闭";
+$lang->score->methods['story']['create'] = "创建{$lang->productSRCommon}";
+$lang->score->methods['story']['close'] = "{$lang->productSRCommon}关闭";
$lang->score->methods['bug']['create'] = '创建Bug';
$lang->score->methods['bug']['confirmBug'] = '确认Bug';
$lang->score->methods['bug']['createFormCase'] = '从用例创建';
@@ -85,4 +85,4 @@ $lang->score->extended['project']['close'] = '项目经理增加##manager,
$lang->score->extended['bug']['resolve'] = 'Bug解决后，额外增加严重程度积分：s1 + ##severity,1##, s2 + ##severity,2##, s3 + ##severity,3##。';
$lang->score->extended['bug']['confirmBug'] = 'Bug确认后，额外增加严重程度积分：s1 + ##severity,1##, s2 + ##severity,2##, s3 + ##severity,3##。';
$lang->score->extended['task']['finish'] = '额外增加工时积分 round(工时 / 10 * 预计 / 消耗) + 优先级积分(p1 ##pri,1##, p2 ##pri,2##)。';
-$lang->score->extended['story']['close'] = "{$lang->storyCommon}的创建者额外增加##createID##分";
+$lang->score->extended['story']['close'] = "{$lang->productSRCommon}的创建者额外增加##createID##分";
diff --git a/module/score/lang/zh-tw.php b/module/score/lang/zh-tw.php
index e84183df2c..9be48d3e51 100644
--- a/module/score/lang/zh-tw.php
+++ b/module/score/lang/zh-tw.php
@@ -30,7 +30,7 @@ $lang->score->modules['user'] = '用戶';
$lang->score->modules['ajax'] = '其它';
$lang->score->modules['doc'] = '文檔';
$lang->score->modules['todo'] = '待辦';
-$lang->score->modules['story'] = $lang->storyCommon;
+$lang->score->modules['story'] = $lang->productSRCommon;
$lang->score->modules['bug'] = 'Bug';
$lang->score->modules['testcase'] = '用例';
$lang->score->modules['testtask'] = '測試單';
@@ -62,8 +62,8 @@ $lang->score->methods['ajax']['batchEdit'] = '首次使用批量編輯
$lang->score->methods['ajax']['batchOther'] = '其它批量操作';
$lang->score->methods['doc']['create'] = '創建文檔';
$lang->score->methods['todo']['create'] = '創建待辦';
-$lang->score->methods['story']['create'] = "創建{$lang->storyCommon}";
-$lang->score->methods['story']['close'] = "{$lang->storyCommon}關閉";
+$lang->score->methods['story']['create'] = "創建{$lang->productSRCommon}";
+$lang->score->methods['story']['close'] = "{$lang->productSRCommon}關閉";
$lang->score->methods['bug']['create'] = '創建Bug';
$lang->score->methods['bug']['confirmBug'] = '確認Bug';
$lang->score->methods['bug']['createFormCase'] = '從用例創建';
@@ -85,4 +85,4 @@ $lang->score->extended['project']['close'] = '項目經理增加##manager,
$lang->score->extended['bug']['resolve'] = 'Bug解決後，額外增加嚴重程度積分：s1 + ##severity,1##, s2 + ##severity,2##, s3 + ##severity,3##。';
$lang->score->extended['bug']['confirmBug'] = 'Bug確認後，額外增加嚴重程度積分：s1 + ##severity,1##, s2 + ##severity,2##, s3 + ##severity,3##。';
$lang->score->extended['task']['finish'] = '額外增加工時積分 round(工時 / 10 * 預計 / 消耗) + 優先順序積分(p1 ##pri,1##, p2 ##pri,2##)。';
-$lang->score->extended['story']['close'] = "{$lang->storyCommon}的創建者額外增加##createID##分";
+$lang->score->extended['story']['close'] = "{$lang->productSRCommon}的創建者額外增加##createID##分";
diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php
index 934566ac63..ff1adddcc0 100644
--- a/module/search/lang/zh-cn.php
+++ b/module/search/lang/zh-cn.php
@@ -20,7 +20,7 @@ $lang->search->buildQuery = '执行搜索';
$lang->search->savedQuery = '已保存的查询条件';
$lang->search->deleteQuery = '删除查询';
$lang->search->setQueryTitle = '请输入查询标题（保存之前请先查询）：';
-$lang->search->select = "{$lang->storyCommon}/任务筛选";
+$lang->search->select = "{$lang->productSRCommon}/任务筛选";
$lang->search->me = '自己';
$lang->search->noQuery = '还没有保存查询！';
$lang->search->onMenuBar = '显示在菜单栏';
diff --git a/module/search/lang/zh-tw.php b/module/search/lang/zh-tw.php
index b84a26f902..5f94af29ad 100644
--- a/module/search/lang/zh-tw.php
+++ b/module/search/lang/zh-tw.php
@@ -20,7 +20,7 @@ $lang->search->buildQuery = '執行搜索';
$lang->search->savedQuery = '已保存的查詢條件';
$lang->search->deleteQuery = '刪除查詢';
$lang->search->setQueryTitle = '請輸入查詢標題（保存之前請先查詢）：';
-$lang->search->select = "{$lang->storyCommon}/任務篩選";
+$lang->search->select = "{$lang->productSRCommon}/任務篩選";
$lang->search->me = '自己';
$lang->search->noQuery = '還沒有保存查詢！';
$lang->search->onMenuBar = '顯示在菜單欄';
diff --git a/module/story/control.php b/module/story/control.php
index 823dfc4c1b..320863e801 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -473,8 +473,8 @@ class story extends control
if($type == 'requirement' and $this->config->URAndSR)
{
$storyLang = $this->lang->story;
- $SRCommon = $this->lang->SRCommon;
- $URCommon = $this->lang->URCommon;
+ $SRCommon = $this->lang->productSRCommon;
+ $URCommon = $this->lang->productURCommon;
$storyLang->create = str_replace($SRCommon, $URCommon, $storyLang->create);
$storyLang->changeAction = str_replace($SRCommon, $URCommon, $storyLang->changeAction);
diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index 3dc5c4a32f..0f38ab7907 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -81,7 +81,7 @@ $lang->story->convertRelations = 'Convert Relations';
$lang->story->skipStory = '%s is a parent story. It cannot be closed.';
$lang->story->closedStory = 'Story %s is closed and will not be closed.';
-$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->storyCommon} and link {$lang->storyCommon} to the task. The closed {$lang->storyCommon} will not be converted into tasks.";
+$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->productSRCommon} and link {$lang->productSRCommon} to the task. The closed {$lang->productSRCommon} will not be converted into tasks.";
$lang->story->successToTask = "Converted to task.";
$lang->story->common = 'Story';
@@ -128,7 +128,7 @@ $lang->story->version = 'Version';
$lang->story->plan = 'Plan';
$lang->story->planAB = 'Plan';
$lang->story->comment = 'Kommentar';
-$lang->story->children = "Child {$lang->storyCommon}";
+$lang->story->children = "Child {$lang->productSRCommon}";
$lang->story->childrenAB = "C";
$lang->story->linkStories = 'Story verknüpfen';
$lang->story->childStories = 'Story aufteilen';
@@ -262,8 +262,8 @@ $lang->story->mustChooseResult = 'Ergebnis wählen';
$lang->story->mustChoosePreVersion = 'Version wählen um es umzukhren.';
$lang->story->noStory = 'Keine Storys. ';
$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. Please review it..';
-$lang->story->cannotDeleteParent = "Can not delete parent {$lang->storyCommon}";
-$lang->story->moveChildrenTips = "Its Child {$lang->storyCommon} will be moved to the selected product when editing the linked product of Parent {$lang->storyCommon}.";
+$lang->story->cannotDeleteParent = "Can not delete parent {$lang->productSRCommon}";
+$lang->story->moveChildrenTips = "Its Child {$lang->productSRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->productSRCommon}.";
$lang->story->changeTips = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
$lang->story->form = new stdclass();
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 3323d944de..6e48397a9b 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -81,7 +81,7 @@ $lang->story->convertRelations = 'Convert Relations';
$lang->story->skipStory = '%s is a parent story. It cannot be closed.';
$lang->story->closedStory = 'Story %s is closed and will not be closed.';
-$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->storyCommon} and link {$lang->storyCommon} to the task. The closed {$lang->storyCommon} will not be converted into tasks.";
+$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->productSRCommon} and link {$lang->productSRCommon} to the task. The closed {$lang->productSRCommon} will not be converted into tasks.";
$lang->story->successToTask = "Converted to task.";
$lang->story->common = 'Story';
@@ -128,7 +128,7 @@ $lang->story->version = 'Version';
$lang->story->plan = 'Linked Plan';
$lang->story->planAB = 'Plan';
$lang->story->comment = 'Comment';
-$lang->story->children = "Child {$lang->storyCommon}";
+$lang->story->children = "Child {$lang->productSRCommon}";
$lang->story->childrenAB = "C";
$lang->story->linkStories = 'Linked Stories';
$lang->story->childStories = 'Decomposed Stories';
@@ -262,8 +262,8 @@ $lang->story->mustChooseResult = 'Select Result';
$lang->story->mustChoosePreVersion = 'Select a version to revert to.';
$lang->story->noStory = 'No stories yet. ';
$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. Please review it..';
-$lang->story->cannotDeleteParent = "Can not delete parent {$lang->storyCommon}";
-$lang->story->moveChildrenTips = "Its Child {$lang->storyCommon} will be moved to the selected product when editing the linked product of Parent {$lang->storyCommon}.";
+$lang->story->cannotDeleteParent = "Can not delete parent {$lang->productSRCommon}";
+$lang->story->moveChildrenTips = "Its Child {$lang->productSRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->productSRCommon}.";
$lang->story->changeTips = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
$lang->story->form = new stdclass();
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index cf384c5869..4669cf9aab 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -81,7 +81,7 @@ $lang->story->convertRelations = 'Convert Relations';
$lang->story->skipStory = '%s is a parent story. It cannot be closed.';
$lang->story->closedStory = 'Story %s is closed and will not be closed.';
-$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->storyCommon} and link {$lang->storyCommon} to the task. The closed {$lang->storyCommon} will not be converted into tasks.";
+$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->productSRCommon} and link {$lang->productSRCommon} to the task. The closed {$lang->productSRCommon} will not be converted into tasks.";
$lang->story->successToTask = "Converted to task.";
$lang->story->common = 'Story';
@@ -128,7 +128,7 @@ $lang->story->version = 'Version';
$lang->story->plan = 'Intégrée Plans';
$lang->story->planAB = 'Plan';
$lang->story->comment = 'Commentaire';
-$lang->story->children = "Enfant {$lang->storyCommon}";
+$lang->story->children = "Enfant {$lang->productSRCommon}";
$lang->story->childrenAB = "C";
$lang->story->linkStories = 'Stories Liées';
$lang->story->childStories = 'Stories Décomposées';
@@ -262,8 +262,8 @@ $lang->story->mustChooseResult = 'Sélect Résultat';
$lang->story->mustChoosePreVersion = 'Sélect une version pour revenir en arrière.';
$lang->story->noStory = "Aucune story pour l'instant. ";
$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. Please review it..';
-$lang->story->cannotDeleteParent = "Impossible de supprimer {$lang->storyCommon} parent";
-$lang->story->moveChildrenTips = "Its Child {$lang->storyCommon} will be moved to the selected product when editing the linked product of Parent {$lang->storyCommon}.";
+$lang->story->cannotDeleteParent = "Impossible de supprimer {$lang->productSRCommon} parent";
+$lang->story->moveChildrenTips = "Its Child {$lang->productSRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->productSRCommon}.";
$lang->story->changeTips = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
$lang->story->form = new stdclass();
diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php
index c68dd1f60d..c98798cdc4 100644
--- a/module/story/lang/vi.php
+++ b/module/story/lang/vi.php
@@ -81,7 +81,7 @@ $lang->story->convertRelations = 'Convert Relations';
$lang->story->skipStory = '%s is a parent story. It cannot be closed.';
$lang->story->closedStory = 'Story %s is closed and will not be closed.';
-$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->storyCommon} and link {$lang->storyCommon} to the task. The closed {$lang->storyCommon} will not be converted into tasks.";
+$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->productSRCommon} and link {$lang->productSRCommon} to the task. The closed {$lang->productSRCommon} will not be converted into tasks.";
$lang->story->successToTask = "Converted to task.";
$lang->story->common = 'Câu chuyện';
@@ -128,7 +128,7 @@ $lang->story->version = 'Phiên bản';
$lang->story->plan = 'Kế hoạch liên kết';
$lang->story->planAB = 'Kế hoạch';
$lang->story->comment = 'Nhận xét';
-$lang->story->children = "$lang->storyCommon} con";
+$lang->story->children = "$lang->productSRCommon} con";
$lang->story->childrenAB = "C";
$lang->story->linkStories = 'Câu chuyện liên kết';
$lang->story->childStories = 'Câu chuyện được phân rã';
@@ -262,8 +262,8 @@ $lang->story->mustChooseResult = 'Chọn kết quả';
$lang->story->mustChoosePreVersion = 'Chọn một phiên bản để chuyển thành.';
$lang->story->noStory = 'Không có câu chuyện nào';
$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. Please review it..';
-$lang->story->cannotDeleteParent = "Không thể xóa {$lang->storyCommon} mẹ";
-$lang->story->moveChildrenTips = "Its Child {$lang->storyCommon} will be moved to the selected product when editing the linked product of Parent {$lang->storyCommon}.";
+$lang->story->cannotDeleteParent = "Không thể xóa {$lang->productSRCommon} mẹ";
+$lang->story->moveChildrenTips = "Its Child {$lang->productSRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->productSRCommon}.";
$lang->story->changeTips = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
$lang->story->form = new stdclass();
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 2eb0ddf341..1616a285ef 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -10,14 +10,14 @@
* @link http://www.zentao.net
*/
global $config;
-$lang->story->create = "提{$lang->storyCommon}";
-$lang->story->createStory = "提{$lang->storyCommon}";
-$lang->story->createRequirement = "提{$lang->storyCommon}";
+$lang->story->create = "提{$lang->productSRCommon}";
+$lang->story->createStory = "提{$lang->productSRCommon}";
+$lang->story->createRequirement = "提{$lang->productSRCommon}";
if($config->URAndSR)
{
- $lang->story->requirement = zget($lang, 'URCommon', "用户需求");
- $lang->story->story = zget($lang, 'SRCommon', "软件需求");
+ $lang->story->requirement = zget($lang, 'productURCommon', "用户需求");
+ $lang->story->story = zget($lang, 'productSRCommon', "软件需求");
$lang->story->createStory = '添加' . $lang->story->story;
$lang->story->createRequirement = '添加' . $lang->story->requirement;
$lang->story->affectedStories = "影响的{$lang->story->story}";
@@ -25,12 +25,12 @@ if($config->URAndSR)
$lang->story->batchCreate = "批量创建";
$lang->story->change = "变更";
-$lang->story->changeAction = "变更{$lang->storyCommon}";
-$lang->story->changed = "{$lang->storyCommon}变更";
+$lang->story->changeAction = "变更{$lang->productSRCommon}";
+$lang->story->changed = "{$lang->productSRCommon}变更";
$lang->story->assignTo = '指派';
-$lang->story->assignAction = "指派{$lang->storyCommon}";
+$lang->story->assignAction = "指派{$lang->productSRCommon}";
$lang->story->review = '评审';
-$lang->story->reviewAction = "评审{$lang->storyCommon}";
+$lang->story->reviewAction = "评审{$lang->productSRCommon}";
$lang->story->needReview = '需要评审';
$lang->story->batchReview = '批量评审';
$lang->story->edit = "编辑";
@@ -40,16 +40,16 @@ $lang->story->link = '关联';
$lang->story->unlink = '移除';
$lang->story->track = '跟踪矩阵';
$lang->story->processStoryChange= '处理需求变更';
-$lang->story->subdivideAction = "细分{$lang->storyCommon}";
+$lang->story->subdivideAction = "细分{$lang->productSRCommon}";
$lang->story->splitRequirent = '拆分';
$lang->story->close = '关闭';
-$lang->story->closeAction = "关闭{$lang->storyCommon}";
+$lang->story->closeAction = "关闭{$lang->productSRCommon}";
$lang->story->batchClose = '批量关闭';
$lang->story->activate = '激活';
-$lang->story->activateAction = "激活{$lang->storyCommon}";
+$lang->story->activateAction = "激活{$lang->productSRCommon}";
$lang->story->delete = "删除";
-$lang->story->deleteAction = "删除{$lang->storyCommon}";
-$lang->story->view = "{$lang->storyCommon}详情";
+$lang->story->deleteAction = "删除{$lang->productSRCommon}";
+$lang->story->view = "{$lang->productSRCommon}详情";
$lang->story->setting = "设置";
$lang->story->tasks = "相关任务";
$lang->story->bugs = "相关Bug";
@@ -60,15 +60,15 @@ $lang->story->caseCount = '用例数';
$lang->story->taskCountAB = 'T';
$lang->story->bugCountAB = 'B';
$lang->story->caseCountAB = 'C';
-$lang->story->linkStory = "关联{$lang->storyCommon}";
-$lang->story->unlinkStory = "移除相关{$lang->storyCommon}";
+$lang->story->linkStory = "关联{$lang->productSRCommon}";
+$lang->story->unlinkStory = "移除相关{$lang->productSRCommon}";
$lang->story->export = "导出数据";
-$lang->story->exportAction = "导出{$lang->storyCommon}";
-$lang->story->zeroCase = "零用例{$lang->storyCommon}";
-$lang->story->zeroTask = "只列零任务{$lang->storyCommon}";
+$lang->story->exportAction = "导出{$lang->productSRCommon}";
+$lang->story->zeroCase = "零用例{$lang->productSRCommon}";
+$lang->story->zeroTask = "只列零任务{$lang->productSRCommon}";
$lang->story->reportChart = "统计报表";
$lang->story->reportAction = "统计报表";
-$lang->story->copyTitle = "同{$lang->storyCommon}名称";
+$lang->story->copyTitle = "同{$lang->productSRCommon}名称";
$lang->story->batchChangePlan = "批量修改{$lang->planCommon}";
$lang->story->batchChangeBranch = "批量修改分支";
$lang->story->batchChangeStage = "批量修改阶段";
@@ -81,10 +81,10 @@ $lang->story->convertRelations = '换算关系';
$lang->story->skipStory = '需求：%s 为父需求，将不会被关闭。';
$lang->story->closedStory = '需求：%s 已关闭，将不会被关闭。';
-$lang->story->batchToTaskTips = "此操作会创建与所选{$lang->storyCommon}同名的任务，并将{$lang->storyCommon}关联到任务中，已关闭的需求不会转为任务。";
+$lang->story->batchToTaskTips = "此操作会创建与所选{$lang->productSRCommon}同名的任务，并将{$lang->productSRCommon}关联到任务中，已关闭的需求不会转为任务。";
$lang->story->successToTask = '批量转任务成功';
-$lang->story->common = $lang->storyCommon;
+$lang->story->common = $lang->productSRCommon;
$lang->story->id = '编号';
$lang->story->parent = '父需求';
$lang->story->product = "所属{$lang->productCommon}";
@@ -92,14 +92,14 @@ $lang->story->program = "所属项目";
$lang->story->branch = "分支/平台";
$lang->story->module = '所属模块';
$lang->story->moduleAB = '模块';
-$lang->story->source = "{$lang->storyCommon}来源";
+$lang->story->source = "{$lang->productSRCommon}来源";
$lang->story->sourceNote = '来源备注';
$lang->story->fromBug = '来源Bug';
-$lang->story->title = "{$lang->storyCommon}名称";
-$lang->story->type = "{$lang->storyCommon}类型";
+$lang->story->title = "{$lang->productSRCommon}名称";
+$lang->story->type = "{$lang->productSRCommon}类型";
$lang->story->color = '标题颜色';
$lang->story->toBug = '转Bug';
-$lang->story->spec = "{$lang->storyCommon}描述";
+$lang->story->spec = "{$lang->productSRCommon}描述";
$lang->story->assign = '指派给';
$lang->story->verify = '验收标准';
$lang->story->pri = '优先级';
@@ -128,23 +128,23 @@ $lang->story->version = '版本号';
$lang->story->plan = "所属{$lang->planCommon}";
$lang->story->planAB = $lang->planCommon;
$lang->story->comment = '备注';
-$lang->story->children = "子{$lang->storyCommon}";
+$lang->story->children = "子{$lang->productSRCommon}";
$lang->story->childrenAB = "子";
-$lang->story->linkStories = "相关{$lang->storyCommon}";
-$lang->story->childStories = "细分{$lang->storyCommon}";
-$lang->story->duplicateStory = "重复{$lang->storyCommon}ID";
+$lang->story->linkStories = "相关{$lang->productSRCommon}";
+$lang->story->childStories = "细分{$lang->productSRCommon}";
+$lang->story->duplicateStory = "重复{$lang->productSRCommon}ID";
$lang->story->reviewResult = '评审结果';
$lang->story->preVersion = '之前版本';
$lang->story->keywords = '关键词';
-$lang->story->newStory = "继续添加{$lang->storyCommon}";
+$lang->story->newStory = "继续添加{$lang->productSRCommon}";
$lang->story->colorTag = '颜色标签';
$lang->story->files = '附件';
-$lang->story->copy = "复制{$lang->storyCommon}";
-$lang->story->total = "总{$lang->storyCommon}";
-$lang->story->allStories = "所有{$lang->storyCommon}";
+$lang->story->copy = "复制{$lang->productSRCommon}";
+$lang->story->total = "总{$lang->productSRCommon}";
+$lang->story->allStories = "所有{$lang->productSRCommon}";
$lang->story->unclosed = '未关闭';
$lang->story->deleted = '已删除';
-$lang->story->released = "已发布{$lang->storyCommon}数";
+$lang->story->released = "已发布{$lang->productSRCommon}数";
$lang->story->URChanged = '用需变更';
$lang->story->design = '相关设计';
$lang->story->case = '相关用例';
@@ -155,7 +155,7 @@ $lang->story->one = '一个';
$lang->story->field = '同步的字段';
$lang->story->ditto = '同上';
-$lang->story->dittoNotice = "该{$lang->storyCommon}与上一{$lang->storyCommon}不属于同一产品！";
+$lang->story->dittoNotice = "该{$lang->productSRCommon}与上一{$lang->productSRCommon}不属于同一产品！";
$lang->story->needNotReviewList[0] = '需要评审';
$lang->story->needNotReviewList[1] = '不需要评审';
@@ -227,7 +227,7 @@ $lang->story->changeList['no'] = '不变更';
$lang->story->changeList['yes'] = '变更';
$lang->story->legendBasicInfo = '基本信息';
-$lang->story->legendLifeTime = "{$lang->storyCommon}的一生";
+$lang->story->legendLifeTime = "{$lang->productSRCommon}的一生";
$lang->story->legendRelated = '相关信息';
$lang->story->legendMailto = '抄送给';
$lang->story->legendAttatch = '附件';
@@ -235,16 +235,16 @@ $lang->story->legendProjectAndTask = $lang->projectCommon . '任务';
$lang->story->legendBugs = '相关Bug';
$lang->story->legendFromBug = '来源Bug';
$lang->story->legendCases = '相关用例';
-$lang->story->legendLinkStories = "相关{$lang->storyCommon}";
-$lang->story->legendChildStories = "细分{$lang->storyCommon}";
-$lang->story->legendSpec = "{$lang->storyCommon}描述";
+$lang->story->legendLinkStories = "相关{$lang->productSRCommon}";
+$lang->story->legendChildStories = "细分{$lang->productSRCommon}";
+$lang->story->legendSpec = "{$lang->productSRCommon}描述";
$lang->story->legendVerify = '验收标准';
$lang->story->legendMisc = '其他相关';
-$lang->story->lblChange = "变更{$lang->storyCommon}";
-$lang->story->lblReview = "评审{$lang->storyCommon}";
-$lang->story->lblActivate = "激活{$lang->storyCommon}";
-$lang->story->lblClose = "关闭{$lang->storyCommon}";
+$lang->story->lblChange = "变更{$lang->productSRCommon}";
+$lang->story->lblReview = "评审{$lang->productSRCommon}";
+$lang->story->lblActivate = "激活{$lang->productSRCommon}";
+$lang->story->lblClose = "关闭{$lang->productSRCommon}";
$lang->story->lblTBC = '任务Bug用例';
$lang->story->checkAffection = '影响范围';
@@ -254,23 +254,23 @@ $lang->story->affectedCases = '影响的用例';
$lang->story->specTemplate = "建议参考的模板：作为一名<某种类型的用户>，我希望<达成某些目的>，这样可以<开发的价值>。";
$lang->story->needNotReview = '不需要评审';
-$lang->story->successSaved = "{$lang->storyCommon}成功添加，";
-$lang->story->confirmDelete = "您确认删除该{$lang->storyCommon}吗?";
-$lang->story->errorEmptyChildStory = "『细分{$lang->storyCommon}』不能为空。";
-$lang->story->errorNotSubdivide = "状态不是激活，或者阶段不是未开始的{$lang->storyCommon}，或者是子需求，则不能细分。";
+$lang->story->successSaved = "{$lang->productSRCommon}成功添加，";
+$lang->story->confirmDelete = "您确认删除该{$lang->productSRCommon}吗?";
+$lang->story->errorEmptyChildStory = "『细分{$lang->productSRCommon}』不能为空。";
+$lang->story->errorNotSubdivide = "状态不是激活，或者阶段不是未开始的{$lang->productSRCommon}，或者是子需求，则不能细分。";
$lang->story->mustChooseResult = '必须选择评审结果';
$lang->story->mustChoosePreVersion = '必须选择回溯的版本';
-$lang->story->noStory = "暂时没有{$lang->storyCommon}。";
-$lang->story->ignoreChangeStage = "{$lang->storyCommon} %s 为草稿状态或已关闭状态，没有修改其阶段。";
-$lang->story->cannotDeleteParent = "不能删除父{$lang->storyCommon}";
-$lang->story->moveChildrenTips = "修改父{$lang->storyCommon}的所属产品会将其下的子{$lang->storyCommon}也移动到所选产品下。";
+$lang->story->noStory = "暂时没有{$lang->productSRCommon}。";
+$lang->story->ignoreChangeStage = "{$lang->productSRCommon} %s 为草稿状态或已关闭状态，没有修改其阶段。";
+$lang->story->cannotDeleteParent = "不能删除父{$lang->productSRCommon}";
+$lang->story->moveChildrenTips = "修改父{$lang->productSRCommon}的所属产品会将其下的子{$lang->productSRCommon}也移动到所选产品下。";
$lang->story->changeTips = '该软件需求关联的用户需求有变更，点击“不变更”忽略此条变更，点击“变更”来进行该软件需求的变更。';
$lang->story->form = new stdclass();
-$lang->story->form->area = "该{$lang->storyCommon}所属范围";
-$lang->story->form->desc = "描述及标准，什么{$lang->storyCommon}？如何验收？";
+$lang->story->form->area = "该{$lang->productSRCommon}所属范围";
+$lang->story->form->desc = "描述及标准，什么{$lang->productSRCommon}？如何验收？";
$lang->story->form->resource = '资源分配，有谁完成？需要多少时间？';
-$lang->story->form->file = "附件，如果该{$lang->storyCommon}有相关文件，请点此上传。";
+$lang->story->form->file = "附件，如果该{$lang->productSRCommon}有相关文件，请点此上传。";
$lang->story->action = new stdclass();
$lang->story->action->reviewed = array('main' => '$date, 由 $actor 记录评审结果，结果为 $extra。', 'extra' => 'reviewResultList');
@@ -283,21 +283,21 @@ $lang->story->action->linked2build = array('main' => '$date, 由
$lang->story->action->unlinkedfrombuild = array('main' => '$date, 由 $actor 从版本 $extra 移除。');
$lang->story->action->linked2release = array('main' => '$date, 由 $actor 关联到发布 $extra。');
$lang->story->action->unlinkedfromrelease = array('main' => '$date, 由 $actor 从发布 $extra 移除。');
-$lang->story->action->linkrelatedstory = array('main' => "\$date, 由 \$actor 关联相关{$lang->storyCommon} \$extra。");
-$lang->story->action->subdividestory = array('main' => "\$date, 由 \$actor 细分为{$lang->storyCommon} \$extra。");
-$lang->story->action->unlinkrelatedstory = array('main' => "\$date, 由 \$actor 移除相关{$lang->storyCommon} \$extra。");
-$lang->story->action->unlinkchildstory = array('main' => "\$date, 由 \$actor 移除细分{$lang->storyCommon} \$extra。");
+$lang->story->action->linkrelatedstory = array('main' => "\$date, 由 \$actor 关联相关{$lang->productSRCommon} \$extra。");
+$lang->story->action->subdividestory = array('main' => "\$date, 由 \$actor 细分为{$lang->productSRCommon} \$extra。");
+$lang->story->action->unlinkrelatedstory = array('main' => "\$date, 由 \$actor 移除相关{$lang->productSRCommon} \$extra。");
+$lang->story->action->unlinkchildstory = array('main' => "\$date, 由 \$actor 移除细分{$lang->productSRCommon} \$extra。");
/* 统计报表。*/
$lang->story->report = new stdclass();
$lang->story->report->common = '报表';
$lang->story->report->select = '请选择报表类型';
$lang->story->report->create = '生成报表';
-$lang->story->report->value = "{$lang->storyCommon}数";
+$lang->story->report->value = "{$lang->productSRCommon}数";
-$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['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['storysPerStatus'] = '按状态进行统计';
$lang->story->report->charts['storysPerStage'] = '按所处阶段进行统计';
@@ -373,12 +373,12 @@ $lang->story->chosen = new stdClass();
$lang->story->chosen->reviewedBy = '选择评审人...';
$lang->story->notice = new stdClass();
-$lang->story->notice->closed = "您选择的{$lang->storyCommon}已经被关闭了！";
+$lang->story->notice->closed = "您选择的{$lang->productSRCommon}已经被关闭了！";
$lang->story->convertToTask = new stdClass();
$lang->story->convertToTask->fieldList = array();
$lang->story->convertToTask->fieldList['module'] = '所属模块';
-$lang->story->convertToTask->fieldList['spec'] = "{$lang->storyCommon}描述";
+$lang->story->convertToTask->fieldList['spec'] = "{$lang->productSRCommon}描述";
$lang->story->convertToTask->fieldList['pri'] = '优先级';
$lang->story->convertToTask->fieldList['mailto'] = '抄送给';
$lang->story->convertToTask->fieldList['assignedTo'] = '指派给';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index 5f06ca660f..8aead0c884 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -9,30 +9,30 @@
* @version $Id: zh-tw.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
-$lang->story->create = "提{$lang->storyCommon}";
+$lang->story->create = "提{$lang->productSRCommon}";
$lang->story->batchCreate = "批量創建";
$lang->story->change = "變更";
-$lang->story->changeAction = "變更{$lang->storyCommon}";
-$lang->story->changed = "{$lang->storyCommon}變更";
+$lang->story->changeAction = "變更{$lang->productSRCommon}";
+$lang->story->changed = "{$lang->productSRCommon}變更";
$lang->story->assignTo = '指派';
-$lang->story->assignAction = "指派{$lang->storyCommon}";
+$lang->story->assignAction = "指派{$lang->productSRCommon}";
$lang->story->review = '評審';
-$lang->story->reviewAction = "評審{$lang->storyCommon}";
+$lang->story->reviewAction = "評審{$lang->productSRCommon}";
$lang->story->needReview = '需要評審';
$lang->story->batchReview = '批量評審';
$lang->story->edit = "編輯";
$lang->story->batchEdit = "批量編輯";
$lang->story->subdivide = '細分';
-$lang->story->subdivideAction = "細分{$lang->storyCommon}";
+$lang->story->subdivideAction = "細分{$lang->productSRCommon}";
$lang->story->splitRequirent = '拆分';
$lang->story->close = '關閉';
-$lang->story->closeAction = "關閉{$lang->storyCommon}";
+$lang->story->closeAction = "關閉{$lang->productSRCommon}";
$lang->story->batchClose = '批量關閉';
$lang->story->activate = '激活';
-$lang->story->activateAction = "激活{$lang->storyCommon}";
+$lang->story->activateAction = "激活{$lang->productSRCommon}";
$lang->story->delete = "刪除";
-$lang->story->deleteAction = "刪除{$lang->storyCommon}";
-$lang->story->view = "{$lang->storyCommon}詳情";
+$lang->story->deleteAction = "刪除{$lang->productSRCommon}";
+$lang->story->view = "{$lang->productSRCommon}詳情";
$lang->story->setting = "設置";
$lang->story->tasks = "相關任務";
$lang->story->bugs = "相關Bug";
@@ -43,15 +43,15 @@ $lang->story->caseCount = '用例數';
$lang->story->taskCountAB = 'T';
$lang->story->bugCountAB = 'B';
$lang->story->caseCountAB = 'C';
-$lang->story->linkStory = "關聯{$lang->storyCommon}";
-$lang->story->unlinkStory = "移除相關{$lang->storyCommon}";
+$lang->story->linkStory = "關聯{$lang->productSRCommon}";
+$lang->story->unlinkStory = "移除相關{$lang->productSRCommon}";
$lang->story->export = "導出數據";
-$lang->story->exportAction = "導出{$lang->storyCommon}";
-$lang->story->zeroCase = "零用例{$lang->storyCommon}";
-$lang->story->zeroTask = "只列零任務{$lang->storyCommon}";
+$lang->story->exportAction = "導出{$lang->productSRCommon}";
+$lang->story->zeroCase = "零用例{$lang->productSRCommon}";
+$lang->story->zeroTask = "只列零任務{$lang->productSRCommon}";
$lang->story->reportChart = "統計報表";
$lang->story->reportAction = "統計報表";
-$lang->story->copyTitle = "同{$lang->storyCommon}名稱";
+$lang->story->copyTitle = "同{$lang->productSRCommon}名稱";
$lang->story->batchChangePlan = "批量修改計劃";
$lang->story->batchChangeBranch = "批量修改分支";
$lang->story->batchChangeStage = "批量修改階段";
@@ -64,24 +64,24 @@ $lang->story->convertRelations = '換算關係';
$lang->story->skipStory = '需求：%s 為父需求，將不會被關閉。';
$lang->story->closedStory = '需求：%s 已關閉，將不會被關閉。';
-$lang->story->batchToTaskTips = "此操作會創建與所選{$lang->storyCommon}同名的任務，並將{$lang->storyCommon}關聯到任務中，已關閉的需求不會轉為任務。";
+$lang->story->batchToTaskTips = "此操作會創建與所選{$lang->productSRCommon}同名的任務，並將{$lang->productSRCommon}關聯到任務中，已關閉的需求不會轉為任務。";
$lang->story->successToTask = '批量轉任務成功';
-$lang->story->common = $lang->storyCommon;
+$lang->story->common = $lang->productSRCommon;
$lang->story->id = '編號';
$lang->story->parent = '父需求';
$lang->story->product = "所屬{$lang->productCommon}";
$lang->story->branch = "分支/平台";
$lang->story->module = '所屬模組';
$lang->story->moduleAB = '模組';
-$lang->story->source = "{$lang->storyCommon}來源";
+$lang->story->source = "{$lang->productSRCommon}來源";
$lang->story->sourceNote = '來源備註';
$lang->story->fromBug = '來源Bug';
-$lang->story->title = "{$lang->storyCommon}名稱";
-$lang->story->type = "{$lang->storyCommon}類型";
+$lang->story->title = "{$lang->productSRCommon}名稱";
+$lang->story->type = "{$lang->productSRCommon}類型";
$lang->story->color = '標題顏色';
$lang->story->toBug = '轉Bug';
-$lang->story->spec = "{$lang->storyCommon}描述";
+$lang->story->spec = "{$lang->productSRCommon}描述";
$lang->story->assign = '指派給';
$lang->story->verify = '驗收標準';
$lang->story->pri = '優先順序';
@@ -110,28 +110,28 @@ $lang->story->version = '版本號';
$lang->story->plan = '所屬計劃';
$lang->story->planAB = '計劃';
$lang->story->comment = '備註';
-$lang->story->children = "子{$lang->storyCommon}";
+$lang->story->children = "子{$lang->productSRCommon}";
$lang->story->childrenAB = "子";
-$lang->story->linkStories = "相關{$lang->storyCommon}";
-$lang->story->childStories = "細分{$lang->storyCommon}";
-$lang->story->duplicateStory = "重複{$lang->storyCommon}ID";
+$lang->story->linkStories = "相關{$lang->productSRCommon}";
+$lang->story->childStories = "細分{$lang->productSRCommon}";
+$lang->story->duplicateStory = "重複{$lang->productSRCommon}ID";
$lang->story->reviewResult = '評審結果';
$lang->story->preVersion = '之前版本';
$lang->story->keywords = '關鍵詞';
-$lang->story->newStory = "繼續添加{$lang->storyCommon}";
+$lang->story->newStory = "繼續添加{$lang->productSRCommon}";
$lang->story->colorTag = '顏色標籤';
$lang->story->files = '附件';
-$lang->story->copy = "複製{$lang->storyCommon}";
-$lang->story->total = "總{$lang->storyCommon}";
-$lang->story->allStories = "所有{$lang->storyCommon}";
+$lang->story->copy = "複製{$lang->productSRCommon}";
+$lang->story->total = "總{$lang->productSRCommon}";
+$lang->story->allStories = "所有{$lang->productSRCommon}";
$lang->story->unclosed = '未關閉';
$lang->story->deleted = '已刪除';
-$lang->story->released = "已發佈{$lang->storyCommon}數";
+$lang->story->released = "已發佈{$lang->productSRCommon}數";
$lang->story->one = '一個';
$lang->story->field = '同步的欄位';
$lang->story->ditto = '同上';
-$lang->story->dittoNotice = "該{$lang->storyCommon}與上一{$lang->storyCommon}不屬於同一產品！";
+$lang->story->dittoNotice = "該{$lang->productSRCommon}與上一{$lang->productSRCommon}不屬於同一產品！";
$lang->story->needNotReviewList[0] = '需要評審';
$lang->story->needNotReviewList[1] = '不需要評審';
@@ -199,7 +199,7 @@ $lang->story->priList[3] = '3';
$lang->story->priList[4] = '4';
$lang->story->legendBasicInfo = '基本信息';
-$lang->story->legendLifeTime = "{$lang->storyCommon}的一生";
+$lang->story->legendLifeTime = "{$lang->productSRCommon}的一生";
$lang->story->legendRelated = '相關信息';
$lang->story->legendMailto = '抄送給';
$lang->story->legendAttatch = '附件';
@@ -207,16 +207,16 @@ $lang->story->legendProjectAndTask = $lang->projectCommon . '任務';
$lang->story->legendBugs = '相關Bug';
$lang->story->legendFromBug = '來源Bug';
$lang->story->legendCases = '相關用例';
-$lang->story->legendLinkStories = "相關{$lang->storyCommon}";
-$lang->story->legendChildStories = "細分{$lang->storyCommon}";
-$lang->story->legendSpec = "{$lang->storyCommon}描述";
+$lang->story->legendLinkStories = "相關{$lang->productSRCommon}";
+$lang->story->legendChildStories = "細分{$lang->productSRCommon}";
+$lang->story->legendSpec = "{$lang->productSRCommon}描述";
$lang->story->legendVerify = '驗收標準';
$lang->story->legendMisc = '其他相關';
-$lang->story->lblChange = "變更{$lang->storyCommon}";
-$lang->story->lblReview = "評審{$lang->storyCommon}";
-$lang->story->lblActivate = "激活{$lang->storyCommon}";
-$lang->story->lblClose = "關閉{$lang->storyCommon}";
+$lang->story->lblChange = "變更{$lang->productSRCommon}";
+$lang->story->lblReview = "評審{$lang->productSRCommon}";
+$lang->story->lblActivate = "激活{$lang->productSRCommon}";
+$lang->story->lblClose = "關閉{$lang->productSRCommon}";
$lang->story->lblTBC = '任務Bug用例';
$lang->story->checkAffection = '影響範圍';
@@ -226,22 +226,22 @@ $lang->story->affectedCases = '影響的用例';
$lang->story->specTemplate = "建議參考的模板：作為一名<某種類型的用戶>，我希望<達成某些目的>，這樣可以<開發的價值>。";
$lang->story->needNotReview = '不需要評審';
-$lang->story->successSaved = "{$lang->storyCommon}成功添加，";
-$lang->story->confirmDelete = "您確認刪除該{$lang->storyCommon}嗎?";
-$lang->story->errorEmptyChildStory = "『細分{$lang->storyCommon}』不能為空。";
-$lang->story->errorNotSubdivide = "狀態不是激活，或者階段不是未開始的{$lang->storyCommon}，或者是子需求，則不能細分。";
+$lang->story->successSaved = "{$lang->productSRCommon}成功添加，";
+$lang->story->confirmDelete = "您確認刪除該{$lang->productSRCommon}嗎?";
+$lang->story->errorEmptyChildStory = "『細分{$lang->productSRCommon}』不能為空。";
+$lang->story->errorNotSubdivide = "狀態不是激活，或者階段不是未開始的{$lang->productSRCommon}，或者是子需求，則不能細分。";
$lang->story->mustChooseResult = '必須選擇評審結果';
$lang->story->mustChoosePreVersion = '必須選擇回溯的版本';
-$lang->story->noStory = "暫時沒有{$lang->storyCommon}。";
-$lang->story->ignoreChangeStage = "{$lang->storyCommon} %s 為草稿狀態或已關閉狀態，沒有修改其階段。";
-$lang->story->cannotDeleteParent = "不能刪除父{$lang->storyCommon}";
-$lang->story->moveChildrenTips = "修改父{$lang->storyCommon}的所屬產品會將其下的子{$lang->storyCommon}也移動到所選產品下。";
+$lang->story->noStory = "暫時沒有{$lang->productSRCommon}。";
+$lang->story->ignoreChangeStage = "{$lang->productSRCommon} %s 為草稿狀態或已關閉狀態，沒有修改其階段。";
+$lang->story->cannotDeleteParent = "不能刪除父{$lang->productSRCommon}";
+$lang->story->moveChildrenTips = "修改父{$lang->productSRCommon}的所屬產品會將其下的子{$lang->productSRCommon}也移動到所選產品下。";
$lang->story->form = new stdclass();
-$lang->story->form->area = "該{$lang->storyCommon}所屬範圍";
-$lang->story->form->desc = "描述及標準，什麼{$lang->storyCommon}？如何驗收？";
+$lang->story->form->area = "該{$lang->productSRCommon}所屬範圍";
+$lang->story->form->desc = "描述及標準，什麼{$lang->productSRCommon}？如何驗收？";
$lang->story->form->resource = '資源分配，有誰完成？需要多少時間？';
-$lang->story->form->file = "附件，如果該{$lang->storyCommon}有相關檔案，請點此上傳。";
+$lang->story->form->file = "附件，如果該{$lang->productSRCommon}有相關檔案，請點此上傳。";
$lang->story->action = new stdclass();
$lang->story->action->reviewed = array('main' => '$date, 由 $actor 記錄評審結果，結果為 $extra。', 'extra' => 'reviewResultList');
@@ -254,21 +254,21 @@ $lang->story->action->linked2build = array('main' => '$date, 由
$lang->story->action->unlinkedfrombuild = array('main' => '$date, 由 $actor 從版本 $extra 移除。');
$lang->story->action->linked2release = array('main' => '$date, 由 $actor 關聯到發佈 $extra。');
$lang->story->action->unlinkedfromrelease = array('main' => '$date, 由 $actor 從發佈 $extra 移除。');
-$lang->story->action->linkrelatedstory = array('main' => "\$date, 由 \$actor 關聯相關{$lang->storyCommon} \$extra。");
-$lang->story->action->subdividestory = array('main' => "\$date, 由 \$actor 細分為{$lang->storyCommon} \$extra。");
-$lang->story->action->unlinkrelatedstory = array('main' => "\$date, 由 \$actor 移除相關{$lang->storyCommon} \$extra。");
-$lang->story->action->unlinkchildstory = array('main' => "\$date, 由 \$actor 移除細分{$lang->storyCommon} \$extra。");
+$lang->story->action->linkrelatedstory = array('main' => "\$date, 由 \$actor 關聯相關{$lang->productSRCommon} \$extra。");
+$lang->story->action->subdividestory = array('main' => "\$date, 由 \$actor 細分為{$lang->productSRCommon} \$extra。");
+$lang->story->action->unlinkrelatedstory = array('main' => "\$date, 由 \$actor 移除相關{$lang->productSRCommon} \$extra。");
+$lang->story->action->unlinkchildstory = array('main' => "\$date, 由 \$actor 移除細分{$lang->productSRCommon} \$extra。");
/* 統計報表。*/
$lang->story->report = new stdclass();
$lang->story->report->common = '報表';
$lang->story->report->select = '請選擇報表類型';
$lang->story->report->create = '生成報表';
-$lang->story->report->value = "{$lang->storyCommon}數";
+$lang->story->report->value = "{$lang->productSRCommon}數";
-$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['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->story->report->charts['storysPerStatus'] = '按狀態進行統計';
$lang->story->report->charts['storysPerStage'] = '按所處階段進行統計';
@@ -344,12 +344,12 @@ $lang->story->chosen = new stdClass();
$lang->story->chosen->reviewedBy = '選擇評審人...';
$lang->story->notice = new stdClass();
-$lang->story->notice->closed = "您選擇的{$lang->storyCommon}已經被關閉了！";
+$lang->story->notice->closed = "您選擇的{$lang->productSRCommon}已經被關閉了！";
$lang->story->convertToTask = new stdClass();
$lang->story->convertToTask->fieldList = array();
$lang->story->convertToTask->fieldList['module'] = '所屬模組';
-$lang->story->convertToTask->fieldList['spec'] = "{$lang->storyCommon}描述";
+$lang->story->convertToTask->fieldList['spec'] = "{$lang->productSRCommon}描述";
$lang->story->convertToTask->fieldList['pri'] = '優先順序';
$lang->story->convertToTask->fieldList['mailto'] = '抄送給';
$lang->story->convertToTask->fieldList['assignedTo'] = '指派給';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 489866a79c..5691b4d712 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -44,8 +44,8 @@ $lang->task->exportAction = "导出任务";
$lang->task->reportChart = "报表统计";
$lang->task->fromBug = '来源Bug';
$lang->task->case = '相关用例';
-$lang->task->confirmStoryChange = "确认{$lang->storyCommon}变动";
-$lang->task->storyChange = "{$lang->storyCommon}变更";
+$lang->task->confirmStoryChange = "确认{$lang->productSRCommon}变动";
+$lang->task->storyChange = "{$lang->productSRCommon}变更";
$lang->task->progress = '进度';
$lang->task->progressAB = '进度';
$lang->task->progressTips = '已消耗/(已消耗+剩余)';
@@ -59,11 +59,11 @@ $lang->task->program = '所属项目';
$lang->task->project = '所属' . $lang->projectCommon;
$lang->task->module = '所属模块';
$lang->task->moduleAB = '模块';
-$lang->task->story = "相关{$lang->storyCommon}";
-$lang->task->storyAB = $lang->storyCommon;
-$lang->task->storySpec = "{$lang->storyCommon}描述";
+$lang->task->story = "相关{$lang->productSRCommon}";
+$lang->task->storyAB = $lang->productSRCommon;
+$lang->task->storySpec = "{$lang->productSRCommon}描述";
$lang->task->storyVerify = '验收标准';
-$lang->task->storyVersion = "{$lang->storyCommon}版本";
+$lang->task->storyVersion = "{$lang->productSRCommon}版本";
$lang->task->color = '标题颜色';
$lang->task->name = '任务名称';
$lang->task->type = '任务类型';
@@ -129,13 +129,13 @@ $lang->task->parent = '父任务';
$lang->task->parentAB = '父';
$lang->task->lblPri = 'P';
$lang->task->lblHour = '(h)';
-$lang->task->lblTestStory = "测试{$lang->storyCommon}";
+$lang->task->lblTestStory = "测试{$lang->productSRCommon}";
$lang->task->ditto = '同上';
$lang->task->dittoNotice = "该任务与上一任务不属于同一项目！";
-$lang->task->selectTestStory = "选择测试{$lang->storyCommon}";
+$lang->task->selectTestStory = "选择测试{$lang->productSRCommon}";
$lang->task->selectAllUser = '全部';
-$lang->task->noStory = "无{$lang->storyCommon}";
+$lang->task->noStory = "无{$lang->productSRCommon}";
$lang->task->noAssigned = '未指派';
$lang->task->noFinished = '未完成';
$lang->task->noClosed = '未关闭';
@@ -171,9 +171,9 @@ $lang->task->reasonList[''] = '';
$lang->task->reasonList['done'] = '已完成';
$lang->task->reasonList['cancel'] = '已取消';
-$lang->task->afterChoices['continueAdding'] = "继续为该{$lang->storyCommon}添加任务";
+$lang->task->afterChoices['continueAdding'] = "继续为该{$lang->productSRCommon}添加任务";
$lang->task->afterChoices['toTaskList'] = '返回任务列表';
-$lang->task->afterChoices['toStoryList'] = "返回{$lang->storyCommon}列表";
+$lang->task->afterChoices['toStoryList'] = "返回{$lang->productSRCommon}列表";
$lang->task->legendBasic = '基本信息';
$lang->task->legendEffort = '工时信息';
@@ -182,17 +182,17 @@ $lang->task->legendDesc = '任务描述';
$lang->task->confirmDelete = "您确定要删除这个任务吗？";
$lang->task->confirmDeleteEstimate = "您确定要删除这个记录吗？";
-$lang->task->copyStoryTitle = "同{$lang->storyCommon}";
+$lang->task->copyStoryTitle = "同{$lang->productSRCommon}";
$lang->task->afterSubmit = "添加之后";
$lang->task->successSaved = "成功添加，";
$lang->task->delayWarning = " 延期%s天 ";
$lang->task->remindBug = "该任务为Bug转化得到，是否更新Bug:%s ?";
-$lang->task->confirmChangeProject = "修改{$lang->projectCommon}会导致相应的所属模块、相关{$lang->storyCommon}和指派人发生变化，确定吗？";
+$lang->task->confirmChangeProject = "修改{$lang->projectCommon}会导致相应的所属模块、相关{$lang->productSRCommon}和指派人发生变化，确定吗？";
$lang->task->confirmFinish = '"预计剩余"为0，确认将任务状态改为"已完成"吗？';
$lang->task->confirmRecord = '"剩余"为0，任务将标记为"已完成"，您确定吗？';
$lang->task->confirmTransfer = '"当前剩余"为0，任务将被转交，您确定吗？';
$lang->task->noticeTaskStart = '"总计消耗"和"预计剩余"不能同时为0';
-$lang->task->noticeLinkStory = "没有可关联的相关{$lang->storyCommon}，您可以为当前项目%s，然后%s";
+$lang->task->noticeLinkStory = "没有可关联的相关{$lang->productSRCommon}，您可以为当前项目%s，然后%s";
$lang->task->noticeSaveRecord = '您有尚未保存的工时记录，请先将其保存。';
$lang->task->commentActions = '%s. %s, 由 %s 添加备注。';
$lang->task->deniedNotice = '当前任务只有%s才可以%s。';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index a67c229080..41f779e4e1 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -44,8 +44,8 @@ $lang->task->exportAction = "導出任務";
$lang->task->reportChart = "報表統計";
$lang->task->fromBug = '來源Bug';
$lang->task->case = '相關用例';
-$lang->task->confirmStoryChange = "確認{$lang->storyCommon}變動";
-$lang->task->storyChange = "{$lang->storyCommon}變更";
+$lang->task->confirmStoryChange = "確認{$lang->productSRCommon}變動";
+$lang->task->storyChange = "{$lang->productSRCommon}變更";
$lang->task->progress = '進度';
$lang->task->progressAB = '進度';
$lang->task->progressTips = '已消耗/(已消耗+剩餘)';
@@ -59,11 +59,11 @@ $lang->task->program = '所屬項目';
$lang->task->project = '所屬' . $lang->projectCommon;
$lang->task->module = '所屬模組';
$lang->task->moduleAB = '模組';
-$lang->task->story = "相關{$lang->storyCommon}";
-$lang->task->storyAB = $lang->storyCommon;
-$lang->task->storySpec = "{$lang->storyCommon}描述";
+$lang->task->story = "相關{$lang->productSRCommon}";
+$lang->task->storyAB = $lang->productSRCommon;
+$lang->task->storySpec = "{$lang->productSRCommon}描述";
$lang->task->storyVerify = '驗收標準';
-$lang->task->storyVersion = "{$lang->storyCommon}版本";
+$lang->task->storyVersion = "{$lang->productSRCommon}版本";
$lang->task->color = '標題顏色';
$lang->task->name = '任務名稱';
$lang->task->type = '任務類型';
@@ -129,13 +129,13 @@ $lang->task->parent = '父任務';
$lang->task->parentAB = '父';
$lang->task->lblPri = 'P';
$lang->task->lblHour = '(h)';
-$lang->task->lblTestStory = "測試{$lang->storyCommon}";
+$lang->task->lblTestStory = "測試{$lang->productSRCommon}";
$lang->task->ditto = '同上';
$lang->task->dittoNotice = "該任務與上一任務不屬於同一項目！";
-$lang->task->selectTestStory = "選擇測試{$lang->storyCommon}";
+$lang->task->selectTestStory = "選擇測試{$lang->productSRCommon}";
$lang->task->selectAllUser = '全部';
-$lang->task->noStory = "無{$lang->storyCommon}";
+$lang->task->noStory = "無{$lang->productSRCommon}";
$lang->task->noAssigned = '未指派';
$lang->task->noFinished = '未完成';
$lang->task->noClosed = '未關閉';
@@ -171,9 +171,9 @@ $lang->task->reasonList[''] = '';
$lang->task->reasonList['done'] = '已完成';
$lang->task->reasonList['cancel'] = '已取消';
-$lang->task->afterChoices['continueAdding'] = "繼續為該{$lang->storyCommon}添加任務";
+$lang->task->afterChoices['continueAdding'] = "繼續為該{$lang->productSRCommon}添加任務";
$lang->task->afterChoices['toTaskList'] = '返回任務列表';
-$lang->task->afterChoices['toStoryList'] = "返回{$lang->storyCommon}列表";
+$lang->task->afterChoices['toStoryList'] = "返回{$lang->productSRCommon}列表";
$lang->task->legendBasic = '基本信息';
$lang->task->legendEffort = '工時信息';
@@ -182,17 +182,17 @@ $lang->task->legendDesc = '任務描述';
$lang->task->confirmDelete = "您確定要刪除這個任務嗎？";
$lang->task->confirmDeleteEstimate = "您確定要刪除這個記錄嗎？";
-$lang->task->copyStoryTitle = "同{$lang->storyCommon}";
+$lang->task->copyStoryTitle = "同{$lang->productSRCommon}";
$lang->task->afterSubmit = "添加之後";
$lang->task->successSaved = "成功添加，";
$lang->task->delayWarning = " 延期%s天 ";
$lang->task->remindBug = "該任務為Bug轉化得到，是否更新Bug:%s ?";
-$lang->task->confirmChangeProject = "修改{$lang->projectCommon}會導致相應的所屬模組、相關{$lang->storyCommon}和指派人發生變化，確定嗎？";
+$lang->task->confirmChangeProject = "修改{$lang->projectCommon}會導致相應的所屬模組、相關{$lang->productSRCommon}和指派人發生變化，確定嗎？";
$lang->task->confirmFinish = '"預計剩餘"為0，確認將任務狀態改為"已完成"嗎？';
$lang->task->confirmRecord = '"剩餘"為0，任務將標記為"已完成"，您確定嗎？';
$lang->task->confirmTransfer = '"當前剩餘"為0，任務將被轉交，您確定嗎？';
$lang->task->noticeTaskStart = '"總計消耗"和"預計剩餘"不能同時為0';
-$lang->task->noticeLinkStory = "沒有可關聯的相關{$lang->storyCommon}，您可以為當前項目%s，然後%s";
+$lang->task->noticeLinkStory = "沒有可關聯的相關{$lang->productSRCommon}，您可以為當前項目%s，然後%s";
$lang->task->noticeSaveRecord = '您有尚未保存的工時記錄，請先將其保存。';
$lang->task->commentActions = '%s. %s, 由 %s 添加備註。';
$lang->task->deniedNotice = '當前任務只有%s才可以%s。';
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 8d18b585e3..c1d84fcecc 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -15,8 +15,8 @@ $lang->testcase->module = '所属模块';
$lang->testcase->lib = "所属库";
$lang->testcase->branch = "分支/平台";
$lang->testcase->moduleAB = '模块';
-$lang->testcase->story = "相关{$lang->storyCommon}";
-$lang->testcase->storyVersion = "{$lang->storyCommon}版本";
+$lang->testcase->story = "相关{$lang->productSRCommon}";
+$lang->testcase->storyVersion = "{$lang->productSRCommon}版本";
$lang->testcase->color = '标题颜色';
$lang->testcase->order = '排序';
$lang->testcase->title = '用例标题';
@@ -97,7 +97,7 @@ $lang->testcase->batchChangeModule = "批量修改模块";
$lang->testcase->confirmLibcaseChange = "同步用例库用例修改";
$lang->testcase->ignoreLibcaseChange = "忽略用例库用例修改";
$lang->testcase->batchChangeBranch = "批量修改分支";
-$lang->testcase->groupByStories = "{$lang->storyCommon}分组";
+$lang->testcase->groupByStories = "{$lang->productSRCommon}分组";
$lang->testcase->batchDelete = "批量删除 ";
$lang->testcase->batchConfirmStoryChange = "批量确认变更";
$lang->testcase->batchCaseTypeChange = "批量修改类型";
@@ -114,7 +114,7 @@ $lang->testcase->exportAction = "导出用例";
$lang->testcase->reportChart = '报表统计';
$lang->testcase->reportAction = '用例报表统计';
$lang->testcase->confirmChange = '确认用例变动';
-$lang->testcase->confirmStoryChange = "确认{$lang->storyCommon}变动";
+$lang->testcase->confirmStoryChange = "确认{$lang->productSRCommon}变动";
$lang->testcase->copy = '复制用例';
$lang->testcase->group = '分组';
$lang->testcase->groupName = '分组名称';
@@ -134,11 +134,11 @@ $lang->testcase->assignToMe = '指派给我的用例';
$lang->testcase->openedByMe = '我建的用例';
$lang->testcase->allCases = '所有';
$lang->testcase->allTestcases = '所有用例';
-$lang->testcase->needConfirm = "{$lang->storyCommon}变动";
+$lang->testcase->needConfirm = "{$lang->productSRCommon}变动";
$lang->testcase->bySearch = '搜索';
$lang->testcase->unexecuted = '未执行';
-$lang->testcase->lblStory = "相关{$lang->storyCommon}";
+$lang->testcase->lblStory = "相关{$lang->productSRCommon}";
$lang->testcase->lblLastEdited = '最后编辑';
$lang->testcase->lblTypeValue = '类型可选值列表';
$lang->testcase->lblStageValue = '阶段可选值列表';
@@ -209,7 +209,7 @@ $lang->testcase->mustChooseResult = '必须选择评审结果';
$lang->testcase->noModule = '您现在还没有模块信息
请维护测试模块
';
$lang->testcase->noCase = '暂时没有用例。';
-$lang->testcase->searchStories = "键入来搜索{$lang->storyCommon}";
+$lang->testcase->searchStories = "键入来搜索{$lang->productSRCommon}";
$lang->testcase->selectLib = '请选择库';
$lang->testcase->action = new stdclass();
@@ -221,5 +221,5 @@ $lang->testcase->featureBar['browse']['wait'] = '待评审';
$lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
$lang->testcase->featureBar['browse']['group'] = '分组查看';
$lang->testcase->featureBar['browse']['suite'] = '套件';
-$lang->testcase->featureBar['browse']['zerocase'] = "零用例{$lang->storyCommon}";
+$lang->testcase->featureBar['browse']['zerocase'] = "零用例{$lang->productSRCommon}";
$lang->testcase->featureBar['groupcase'] = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index 74398cf890..3e38752687 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -15,8 +15,8 @@ $lang->testcase->module = '所屬模組';
$lang->testcase->lib = "所屬庫";
$lang->testcase->branch = "分支/平台";
$lang->testcase->moduleAB = '模組';
-$lang->testcase->story = "相關{$lang->storyCommon}";
-$lang->testcase->storyVersion = "{$lang->storyCommon}版本";
+$lang->testcase->story = "相關{$lang->productSRCommon}";
+$lang->testcase->storyVersion = "{$lang->productSRCommon}版本";
$lang->testcase->color = '標題顏色';
$lang->testcase->order = '排序';
$lang->testcase->title = '用例標題';
@@ -97,7 +97,7 @@ $lang->testcase->batchChangeModule = "批量修改模組";
$lang->testcase->confirmLibcaseChange = "同步用例庫用例修改";
$lang->testcase->ignoreLibcaseChange = "忽略用例庫用例修改";
$lang->testcase->batchChangeBranch = "批量修改分支";
-$lang->testcase->groupByStories = "{$lang->storyCommon}分組";
+$lang->testcase->groupByStories = "{$lang->productSRCommon}分組";
$lang->testcase->batchDelete = "批量刪除 ";
$lang->testcase->batchConfirmStoryChange = "批量確認變更";
$lang->testcase->batchCaseTypeChange = "批量修改類型";
@@ -114,7 +114,7 @@ $lang->testcase->exportAction = "導出用例";
$lang->testcase->reportChart = '報表統計';
$lang->testcase->reportAction = '用例報表統計';
$lang->testcase->confirmChange = '確認用例變動';
-$lang->testcase->confirmStoryChange = "確認{$lang->storyCommon}變動";
+$lang->testcase->confirmStoryChange = "確認{$lang->productSRCommon}變動";
$lang->testcase->copy = '複製用例';
$lang->testcase->group = '分組';
$lang->testcase->groupName = '分組名稱';
@@ -134,11 +134,11 @@ $lang->testcase->assignToMe = '給我的用例';
$lang->testcase->openedByMe = '我建的用例';
$lang->testcase->allCases = '所有';
$lang->testcase->allTestcases = '所有用例';
-$lang->testcase->needConfirm = "{$lang->storyCommon}變動";
+$lang->testcase->needConfirm = "{$lang->productSRCommon}變動";
$lang->testcase->bySearch = '搜索';
$lang->testcase->unexecuted = '未執行';
-$lang->testcase->lblStory = "相關{$lang->storyCommon}";
+$lang->testcase->lblStory = "相關{$lang->productSRCommon}";
$lang->testcase->lblLastEdited = '最後編輯';
$lang->testcase->lblTypeValue = '類型可選值列表';
$lang->testcase->lblStageValue = '階段可選值列表';
@@ -209,7 +209,7 @@ $lang->testcase->mustChooseResult = '必須選擇評審結果';
$lang->testcase->noModule = '您現在還沒有模組信息
請維護測試模組
';
$lang->testcase->noCase = '暫時沒有用例。';
-$lang->testcase->searchStories = "鍵入來搜索{$lang->storyCommon}";
+$lang->testcase->searchStories = "鍵入來搜索{$lang->productSRCommon}";
$lang->testcase->selectLib = '請選擇庫';
$lang->testcase->action = new stdclass();
@@ -221,5 +221,5 @@ $lang->testcase->featureBar['browse']['wait'] = '待評審';
$lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
$lang->testcase->featureBar['browse']['group'] = '分組查看';
$lang->testcase->featureBar['browse']['suite'] = '套件';
-$lang->testcase->featureBar['browse']['zerocase'] = "零用例{$lang->storyCommon}";
+$lang->testcase->featureBar['browse']['zerocase'] = "零用例{$lang->productSRCommon}";
$lang->testcase->featureBar['groupcase'] = $lang->testcase->featureBar['browse'];
diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php
index f7518fe066..16c30a0cad 100644
--- a/module/testreport/lang/zh-cn.php
+++ b/module/testreport/lang/zh-cn.php
@@ -12,7 +12,7 @@ $lang->testreport->recreate = '重新生成报告';
$lang->testreport->title = '标题';
$lang->testreport->product = "所属{$lang->productCommon}";
$lang->testreport->bugTitle = 'Bug 标题';
-$lang->testreport->storyTitle = "{$lang->storyCommon}标题";
+$lang->testreport->storyTitle = "{$lang->productSRCommon}标题";
$lang->testreport->project = '所属项目';
$lang->testreport->testtask = '测试版本';
$lang->testreport->tasks = $lang->testreport->testtask;
@@ -21,7 +21,7 @@ $lang->testreport->owner = '负责人';
$lang->testreport->members = '参与人员';
$lang->testreport->begin = '开始时间';
$lang->testreport->end = '结束时间';
-$lang->testreport->stories = "测试的{$lang->storyCommon}";
+$lang->testreport->stories = "测试的{$lang->productSRCommon}";
$lang->testreport->bugs = '测试的Bug';
$lang->testreport->builds = '版本信息';
$lang->testreport->goal = '项目目标';
diff --git a/module/testreport/lang/zh-tw.php b/module/testreport/lang/zh-tw.php
index 4b2f18b35f..3113e01e33 100644
--- a/module/testreport/lang/zh-tw.php
+++ b/module/testreport/lang/zh-tw.php
@@ -12,7 +12,7 @@ $lang->testreport->recreate = '重新生成報告';
$lang->testreport->title = '標題';
$lang->testreport->product = "所屬{$lang->productCommon}";
$lang->testreport->bugTitle = 'Bug 標題';
-$lang->testreport->storyTitle = "{$lang->storyCommon}標題";
+$lang->testreport->storyTitle = "{$lang->productSRCommon}標題";
$lang->testreport->project = '所屬項目';
$lang->testreport->testtask = '測試版本';
$lang->testreport->tasks = $lang->testreport->testtask;
@@ -21,7 +21,7 @@ $lang->testreport->owner = '負責人';
$lang->testreport->members = '參與人員';
$lang->testreport->begin = '開始時間';
$lang->testreport->end = '結束時間';
-$lang->testreport->stories = "測試的{$lang->storyCommon}";
+$lang->testreport->stories = "測試的{$lang->productSRCommon}";
$lang->testreport->bugs = '測試的Bug';
$lang->testreport->builds = '版本信息';
$lang->testreport->goal = '項目目標';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index fe731e141d..3527b09a70 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -111,7 +111,7 @@ $lang->testtask->priList[4] = '4';
$lang->testtask->unlinkedCases = '未关联';
$lang->testtask->linkByBuild = '复制测试单';
-$lang->testtask->linkByStory = "按{$lang->storyCommon}关联";
+$lang->testtask->linkByStory = "按{$lang->productSRCommon}关联";
$lang->testtask->linkByBug = '按Bug关联';
$lang->testtask->linkBySuite = '按套件关联';
$lang->testtask->passAll = '全部通过';
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index a769828c79..5917adab23 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -111,7 +111,7 @@ $lang->testtask->priList[4] = '4';
$lang->testtask->unlinkedCases = '未關聯';
$lang->testtask->linkByBuild = '複製測試單';
-$lang->testtask->linkByStory = "按{$lang->storyCommon}關聯";
+$lang->testtask->linkByStory = "按{$lang->productSRCommon}關聯";
$lang->testtask->linkByBug = '按Bug關聯';
$lang->testtask->linkBySuite = '按套件關聯';
$lang->testtask->passAll = '全部通過';
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 6b37f5328f..00e669ec21 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -34,7 +34,7 @@ $lang->todo->legendBasic = "基本信息";
$lang->todo->cycle = "周期";
$lang->todo->cycleConfig = "周期设置";
-$lang->todo->reasonList['story'] = "转{$lang->storyCommon}";
+$lang->todo->reasonList['story'] = "转{$lang->productSRCommon}";
$lang->todo->reasonList['task'] = "转任务";
$lang->todo->reasonList['bug'] = "转Bug";
$lang->todo->reasonList['done'] = "完成";
@@ -94,7 +94,7 @@ $lang->todo->typeList['custom'] = '自定义';
$lang->todo->typeList['cycle'] = '周期';
$lang->todo->typeList['bug'] = 'Bug';
$lang->todo->typeList['task'] = $lang->projectCommon . '任务';
-$lang->todo->typeList['story'] = $lang->projectCommon . $lang->storyCommon;
+$lang->todo->typeList['story'] = $lang->projectCommon . $lang->productSRCommon;
$lang->todo->confirmDelete = "您确定要删除这条待办吗？";
$lang->todo->thisIsPrivate = '这是一条私人事务。:)';
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index 6a61192571..5416fac99e 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -34,7 +34,7 @@ $lang->todo->legendBasic = "基本信息";
$lang->todo->cycle = "周期";
$lang->todo->cycleConfig = "周期設置";
-$lang->todo->reasonList['story'] = "轉{$lang->storyCommon}";
+$lang->todo->reasonList['story'] = "轉{$lang->productSRCommon}";
$lang->todo->reasonList['task'] = "轉任務";
$lang->todo->reasonList['bug'] = "轉Bug";
$lang->todo->reasonList['done'] = "完成";
@@ -94,7 +94,7 @@ $lang->todo->typeList['custom'] = '自定義';
$lang->todo->typeList['cycle'] = '周期';
$lang->todo->typeList['bug'] = 'Bug';
$lang->todo->typeList['task'] = $lang->projectCommon . '任務';
-$lang->todo->typeList['story'] = $lang->projectCommon . $lang->storyCommon;
+$lang->todo->typeList['story'] = $lang->projectCommon . $lang->productSRCommon;
$lang->todo->confirmDelete = "您確定要刪除這條待辦嗎？";
$lang->todo->thisIsPrivate = '這是一條私人事務。:)';
diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php
index 83c34101d6..309f6fa54a 100644
--- a/module/tree/lang/zh-cn.php
+++ b/module/tree/lang/zh-cn.php
@@ -38,7 +38,7 @@ $lang->tree->sort = "排序";
$lang->tree->addChild = "增加子模块";
$lang->tree->confirmDelete = '该模块及其子模块都会被删除，您确定删除吗？';
$lang->tree->confirmDeleteLine = "您确定删除该{$lang->productCommon}线吗？";
-$lang->tree->confirmRoot = "模块的所属{$lang->productCommon}修改，会关联修改该模块下的{$lang->storyCommon}、Bug、用例的所属{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
+$lang->tree->confirmRoot = "模块的所属{$lang->productCommon}修改，会关联修改该模块下的{$lang->productSRCommon}、Bug、用例的所属{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
$lang->tree->confirmRoot4Doc = "修改所属文档库，会同时修改该分类下文档的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
$lang->tree->successSave = '成功保存';
$lang->tree->successFixed = '成功修正数据！';
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
index 56adcbf2a9..6081118d82 100644
--- a/module/tree/lang/zh-tw.php
+++ b/module/tree/lang/zh-tw.php
@@ -38,7 +38,7 @@ $lang->tree->sort = "排序";
$lang->tree->addChild = "增加子模組";
$lang->tree->confirmDelete = '該模組及其子模組都會被刪除，您確定刪除嗎？';
$lang->tree->confirmDeleteLine = "您確定刪除該{$lang->productCommon}綫嗎？";
-$lang->tree->confirmRoot = "模組的所屬{$lang->productCommon}修改，會關聯修改該模組下的{$lang->storyCommon}、Bug、用例的所屬{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
+$lang->tree->confirmRoot = "模組的所屬{$lang->productCommon}修改，會關聯修改該模組下的{$lang->productSRCommon}、Bug、用例的所屬{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
$lang->tree->confirmRoot4Doc = "修改所屬文檔庫，會同時修改該分類下文檔的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
$lang->tree->successSave = '成功保存';
$lang->tree->successFixed = '成功修正數據！';
diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php
index 888d940928..623a3e46b0 100644
--- a/module/tutorial/lang/zh-cn.php
+++ b/module/tutorial/lang/zh-cn.php
@@ -48,9 +48,9 @@ if($config->global->flow == 'full' or $config->global->flow != 'onlyTask')
if($config->global->flow == 'full' or $config->global->flow == 'onlyStory')
{
- $lang->tutorial->tasks['createStory'] = array('title' => "创建{$lang->storyCommon}");
- $lang->tutorial->tasks['createStory']['nav'] = array('module' => 'story', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'story', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => "提{$lang->storyCommon}");
- $lang->tutorial->tasks['createStory']['desc'] = "在系统创建一个新的{$lang->storyCommon}：
- 打开 {$lang->productCommon} {$lang->storyCommon} 添加{$lang->storyCommon} 页面；
- 在表单中填写要创建的{$lang->storyCommon}信息；
- 保存{$lang->storyCommon}信息。
";
+ $lang->tutorial->tasks['createStory'] = array('title' => "创建{$lang->productSRCommon}");
+ $lang->tutorial->tasks['createStory']['nav'] = array('module' => 'story', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'story', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => "提{$lang->productSRCommon}");
+ $lang->tutorial->tasks['createStory']['desc'] = "在系统创建一个新的{$lang->productSRCommon}：
- 打开 {$lang->productCommon} {$lang->productSRCommon} 添加{$lang->productSRCommon} 页面；
- 在表单中填写要创建的{$lang->productSRCommon}信息；
- 保存{$lang->productSRCommon}信息。
";
}
if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
@@ -65,14 +65,14 @@ if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
if($config->global->flow == 'full')
{
- $lang->tutorial->tasks['linkStory'] = array('title' => "关联{$lang->storyCommon}");
- $lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "关联{$lang->storyCommon}");
- $lang->tutorial->tasks['linkStory']['desc'] = "将{$lang->storyCommon}关联到{$lang->projectCommon}：
- 打开 {$lang->projectCommon} {$lang->storyCommon} 关联{$lang->storyCommon} 页面；
- 在{$lang->storyCommon}列表中勾选要关联的{$lang->storyCommon}；
- 保存关联的{$lang->storyCommon}信息。
";
+ $lang->tutorial->tasks['linkStory'] = array('title' => "关联{$lang->productSRCommon}");
+ $lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "关联{$lang->productSRCommon}");
+ $lang->tutorial->tasks['linkStory']['desc'] = "将{$lang->productSRCommon}关联到{$lang->projectCommon}：
- 打开 {$lang->projectCommon} {$lang->productSRCommon} 关联{$lang->productSRCommon} 页面；
- 在{$lang->productSRCommon}列表中勾选要关联的{$lang->productSRCommon}；
- 保存关联的{$lang->productSRCommon}信息。
";
}
$lang->tutorial->tasks['createTask'] = array('title' => '分解任务');
$lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '建任务');
- $lang->tutorial->tasks['createTask']['desc'] = "将{$lang->projectCommon}{$lang->storyCommon}分解为任务：
- 打开 {$lang->projectCommon} {$lang->storyCommon} 分解任务 页面；
- 在表单中填写任务信息；
- 保存任务信息。
";
+ $lang->tutorial->tasks['createTask']['desc'] = "将{$lang->projectCommon}{$lang->productSRCommon}分解为任务：
- 打开 {$lang->projectCommon} {$lang->productSRCommon} 分解任务 页面；
- 在表单中填写任务信息；
- 保存任务信息。
";
}
if($config->global->flow == 'full' or $config->global->flow == 'onlyTest')
diff --git a/module/tutorial/lang/zh-tw.php b/module/tutorial/lang/zh-tw.php
index d8fb1715c2..fa673539fe 100644
--- a/module/tutorial/lang/zh-tw.php
+++ b/module/tutorial/lang/zh-tw.php
@@ -48,9 +48,9 @@ if($config->global->flow == 'full' or $config->global->flow != 'onlyTask')
if($config->global->flow == 'full' or $config->global->flow == 'onlyStory')
{
- $lang->tutorial->tasks['createStory'] = array('title' => "創建{$lang->storyCommon}");
- $lang->tutorial->tasks['createStory']['nav'] = array('module' => 'story', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'story', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => "提{$lang->storyCommon}");
- $lang->tutorial->tasks['createStory']['desc'] = "在系統創建一個新的{$lang->storyCommon}：
- 打開 {$lang->productCommon} {$lang->storyCommon} 添加{$lang->storyCommon} 頁面；
- 在表單中填寫要創建的{$lang->storyCommon}信息；
- 保存{$lang->storyCommon}信息。
";
+ $lang->tutorial->tasks['createStory'] = array('title' => "創建{$lang->productSRCommon}");
+ $lang->tutorial->tasks['createStory']['nav'] = array('module' => 'story', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'story', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => "提{$lang->productSRCommon}");
+ $lang->tutorial->tasks['createStory']['desc'] = "在系統創建一個新的{$lang->productSRCommon}：
- 打開 {$lang->productCommon} {$lang->productSRCommon} 添加{$lang->productSRCommon} 頁面；
- 在表單中填寫要創建的{$lang->productSRCommon}信息；
- 保存{$lang->productSRCommon}信息。
";
}
if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
@@ -65,14 +65,14 @@ if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
if($config->global->flow == 'full')
{
- $lang->tutorial->tasks['linkStory'] = array('title' => "關聯{$lang->storyCommon}");
- $lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "關聯{$lang->storyCommon}");
- $lang->tutorial->tasks['linkStory']['desc'] = "將{$lang->storyCommon}關聯到{$lang->projectCommon}：
- 打開 {$lang->projectCommon} {$lang->storyCommon} 關聯{$lang->storyCommon} 頁面；
- 在{$lang->storyCommon}列表中勾選要關聯的{$lang->storyCommon}；
- 保存關聯的{$lang->storyCommon}信息。
";
+ $lang->tutorial->tasks['linkStory'] = array('title' => "關聯{$lang->productSRCommon}");
+ $lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "關聯{$lang->productSRCommon}");
+ $lang->tutorial->tasks['linkStory']['desc'] = "將{$lang->productSRCommon}關聯到{$lang->projectCommon}：
- 打開 {$lang->projectCommon} {$lang->productSRCommon} 關聯{$lang->productSRCommon} 頁面；
- 在{$lang->productSRCommon}列表中勾選要關聯的{$lang->productSRCommon}；
- 保存關聯的{$lang->productSRCommon}信息。
";
}
$lang->tutorial->tasks['createTask'] = array('title' => '分解任務');
$lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '建任務');
- $lang->tutorial->tasks['createTask']['desc'] = "將{$lang->projectCommon}{$lang->storyCommon}分解為任務：
- 打開 {$lang->projectCommon} {$lang->storyCommon} 分解任務 頁面；
- 在表單中填寫任務信息；
- 保存任務信息。
";
+ $lang->tutorial->tasks['createTask']['desc'] = "將{$lang->projectCommon}{$lang->productSRCommon}分解為任務：
- 打開 {$lang->projectCommon} {$lang->productSRCommon} 分解任務 頁面；
- 在表單中填寫任務信息；
- 保存任務信息。
";
}
if($config->global->flow == 'full' or $config->global->flow == 'onlyTest')
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index f71063a13f..d97ba6c1b8 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -97,7 +97,7 @@ $lang->user->testTask = '测试单';
$lang->user->testCase = '测试用例';
$lang->user->schedule = '日程';
$lang->user->todo = '待办';
-$lang->user->story = $lang->storyCommon;
+$lang->user->story = $lang->productSRCommon;
$lang->user->dynamic = '动态';
$lang->user->openedBy = '由%s创建';
@@ -145,7 +145,7 @@ $lang->user->statusList['active'] = '正常';
$lang->user->statusList['delete'] = '删除';
$lang->user->personalData['createdTodos'] = '创建的待办数';
-$lang->user->personalData['createdStories'] = "创建的{$lang->storyCommon}数";
+$lang->user->personalData['createdStories'] = "创建的{$lang->productSRCommon}数";
$lang->user->personalData['finishedTasks'] = '完成的任务数';
$lang->user->personalData['resolvedBugs'] = '解决的Bug数';
$lang->user->personalData['createdCases'] = '创建的用例数';
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index 52c9000dfd..b8780b89fe 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -95,7 +95,7 @@ $lang->user->testTask = '測試單';
$lang->user->testCase = '測試用例';
$lang->user->schedule = '日程';
$lang->user->todo = '待辦';
-$lang->user->story = $lang->storyCommon;
+$lang->user->story = $lang->productSRCommon;
$lang->user->dynamic = '動態';
$lang->user->openedBy = '由%s創建';
@@ -143,7 +143,7 @@ $lang->user->statusList['active'] = '正常';
$lang->user->statusList['delete'] = '刪除';
$lang->user->personalData['createdTodos'] = '創建的待辦數';
-$lang->user->personalData['createdStories'] = "創建的{$lang->storyCommon}數";
+$lang->user->personalData['createdStories'] = "創建的{$lang->productSRCommon}數";
$lang->user->personalData['finishedTasks'] = '完成的任務數';
$lang->user->personalData['resolvedBugs'] = '解決的Bug數';
$lang->user->personalData['createdCases'] = '創建的用例數';
diff --git a/module/weekly/model.php b/module/weekly/model.php
index 0d16906ded..b016b54e10 100644
--- a/module/weekly/model.php
+++ b/module/weekly/model.php
@@ -177,7 +177,7 @@ class weeklyModel extends model
if(!$date) $date = date('Y-m-d');
$monday = $this->getThisMonday($date);
$sunday = $this->getThisSunday($date);
- $projects = $this->loadModel('project')->getExecutionList($program, $status = 'all', $limit = 0, $productID = 0, $branch = 0);
+ $projects = $this->loadModel('project')->getExecutionList($program, 'all', $status = 'all', $limit = 0, $productID = 0, $branch = 0);
$projectIdList = array_keys($projects);
return $this->dao->select('count(distinct t1.account) as count')
@@ -204,7 +204,7 @@ class weeklyModel extends model
$monday = $this->getThisMonday($date);
$sunday = $this->getThisSunday($date);
- $projects = $this->loadModel('project')->getExecutionList($program, $status = 'all', $limit = 0, $productID = 0, $branch = 0);
+ $projects = $this->loadModel('project')->getExecutionList($program, 'all', $status = 'all', $limit = 0, $productID = 0, $branch = 0);
$projectIdList = array_keys($projects);
$tasks = $this->dao->select('*')
@@ -232,7 +232,7 @@ class weeklyModel extends model
$sunday = $this->getThisSunday($date);
$nextMonday = date('Y-m-d', strtotime("$sunday +1 days"));
- $projects = $this->loadModel('project')->getExecutionList($program, $status = 'all', $limit = 0, $productID = 0, $branch = 0);
+ $projects = $this->loadModel('project')->getExecutionList($program, 'all', $status = 'all', $limit = 0, $productID = 0, $branch = 0);
$projectIdList = array_keys($projects);
$unFinished = $this->dao->select('*')
->from(TABLE_TASK)
@@ -269,7 +269,7 @@ class weeklyModel extends model
$nextMonday = date('Y-m-d', strtotime("$sunday +1 days"));
$sencondMondy = date('Y-m-d', strtotime("$sunday +8 days"));
- $projects = $this->loadModel('project')->getExecutionList($program, $status = 'all', $limit = 0, $productID = 0, $branch = 0);
+ $projects = $this->loadModel('project')->getExecutionList($program, 'all', $status = 'all', $limit = 0, $productID = 0, $branch = 0);
$projectIdList = array_keys($projects);
$tasks = $this->dao->select('*')
@@ -297,7 +297,7 @@ class weeklyModel extends model
$nextMonday = date('Y-m-d', strtotime("$sunday +1 days"));
$sencondMondy = date('Y-m-d', strtotime("$sunday +8 days"));
- $projects = $this->loadModel('project')->getExecutionList($program, $status = 'all', $limit = 0, $productID = 0, $branch = 0);
+ $projects = $this->loadModel('project')->getExecutionList($program, 'all', $status = 'all', $limit = 0, $productID = 0, $branch = 0);
$projectIdList = array_keys($projects);
return $this->dao->select('type, sum(cast(estimate as decimal(10,2))) as workload')
From 5ef321f149777609fc52968e39578a22529bb8ab Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Wed, 25 Nov 2020 10:59:41 +0800
Subject: [PATCH 2/5] * Adjust code logic.
---
module/block/control.php | 4 +--
module/doc/model.php | 15 +++++-----
module/product/model.php | 5 ++--
module/program/model.php | 3 +-
module/programplan/model.php | 5 ++--
module/project/control.php | 22 +++++++-------
module/project/model.php | 6 ++--
module/project/view/all.html.php | 50 ++++++++++++++++----------------
module/task/control.php | 2 +-
9 files changed, 57 insertions(+), 55 deletions(-)
diff --git a/module/block/control.php b/module/block/control.php
index 781192e20e..732c8f5f62 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -847,7 +847,7 @@ class block extends control
if($project->model == 'scrum')
{
$project->progress = $project->allStories == 0 ? 0 : round($project->doneStories / $project->allStories, 3) * 100;
- $project->executions = $this->project->getExecutionStats($projectID, 'all', 0, 0, 1, 'id_desc', null);
+ $project->executions = $this->project->getExecutionStats($projectID, 'all', 0, 0, 30, 'path_asc,id_asc');
}
elseif($project->model == 'waterfall')
{
@@ -1298,7 +1298,7 @@ class block extends control
$count = isset($this->params->count) ? (int)$this->params->count : 15;
$type = isset($this->params->type) ? $this->params->type : 'all';
$pager = pager::init(0, $count, 1);
- $this->view->executionStats = $this->loadModel('project')->getExecutionStats($this->session->PRJ, $type, $productID = 0, $branch = 0, $itemCounts = 30, $orderBy = 'order_desc', $this->viewType != 'json' ? $pager : '');
+ $this->view->executionStats = $this->loadModel('project')->getExecutionStats($this->session->PRJ, $type, 0, 0, 30, 'path_asc,id_asc', $pager);
}
/**
diff --git a/module/doc/model.php b/module/doc/model.php
index 2c9a06235d..93bc897394 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -152,15 +152,16 @@ class docModel extends model
{
$idList = array();
if($type == 'product') $idList = $this->loadModel('product')->getProductIDByProject($projectID, false);
- if($type == 'project') $idList = $this->loadModel('project')->getExecutionPairs($projectID, 'all', 'noclosed');
+ if($type == 'project')
+ {
+ $status = strpos($this->config->doc->custom->showLibs, 'unclosed') !== false ? 'undone' : 'all';
+ $idList = $this->loadModel('project')->getExecutionIdList($projectID, $status);
+ }
$table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
- $stmt = $this->dao->select('t1.*')->from(TABLE_DOCLIB)->alias('t1')
- ->leftJoin($table)->alias('t2')->on("t1.$type=t2.id")
- ->andWhere('t2.id')->in($idList)
- ->beginIF($type == 'project' and strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('t2.status')->notin('done,closed')->fi()
- ->andWhere('t1.deleted')->eq(0)
- ->orderBy("t2.order desc, t1.order, t1.id")
+ $stmt = $this->dao->select('*')->from(TABLE_DOCLIB)
+ ->where($type)->in($idList)
+ ->andWhere('deleted')->eq('0')
->query();
}
elseif($type == 'all')
diff --git a/module/product/model.php b/module/product/model.php
index 45fe6f956d..371cb0f5ef 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -758,10 +758,11 @@ class productModel extends model
*
* @param int $productID
* @param int $branch
+ * @param string $orderBy
* @access public
* @return array
*/
- public function getExecutionPairsByProduct($productID, $branch = 0)
+ public function getExecutionPairsByProduct($productID, $branch = 0, $orderBy = 'path_asc,id_asc')
{
if(!$this->session->PRJ || !$productID) return array();
@@ -772,7 +773,7 @@ class productModel extends model
->beginIF($branch)->andWhere('t1.branch')->in($branch)->fi()
->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi()
->andWhere('t2.deleted')->eq('0')
- ->orderBy('t2.path_asc')
+ ->orderBy($orderBy)
->fetchAll('id');
/* The waterfall project needs to show the hierarchy and remove the parent stage. */
diff --git a/module/program/model.php b/module/program/model.php
index 5c91e9b4b9..22cf6dd8cb 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -840,13 +840,12 @@ class programModel extends model
foreach($projects as $projectID => $project)
{
- $orderBy = $project->model == 'waterfall' ? 'id_asc' : 'id_desc';
+ $orderBy = $project->model == 'waterfall' ? 'path_asc,id_asc' : 'id_desc';
$project->executions = $this->project->getExecutionStats($projectID, $status, 0, 0, $itemCounts, $orderBy);
$project->teamCount = isset($teams[$projectID]) ? $teams[$projectID]->count : 0;
$project->estimate = isset($estimates[$projectID]) ? $estimates[$projectID]->estimate : 0;
$project->parentName = $this->getPRJParentName($project->parent);
}
-
return $projects;
}
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 3e71a05299..936815b8de 100644
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -805,13 +805,14 @@ class programplanModel extends model
case 'actions':
common::printIcon('project', 'start', "projectID={$plan->id}", $plan, 'list', '', '', 'iframe', true);
common::printIcon('task', 'create', "projectID={$plan->id}", $plan, 'list');
- if($this->isCreateTask($plan->id))
+
+ if($plan->grade == 1 && $this->isCreateTask($plan->id))
{
common::printIcon('programplan', 'create', "program={$plan->parent}&productID=$plan->product&planID=$plan->id", $plan, 'list', 'treemap', '', '', '', '', $this->lang->programplan->createSubPlan);
}
else
{
- $disabled = ($plan->parent == 0) ? ' disabled' : '';
+ $disabled = ($plan->grade == 2) ? ' disabled' : '';
echo html::a('javascript:alert("' . $this->lang->programplan->error->createdTask . '");', '', '', 'class="btn ' . $disabled . '"');
}
diff --git a/module/project/control.php b/module/project/control.php
index 7ccf4b4cf1..7864a50243 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -2469,7 +2469,7 @@ class project extends control
* @access public
* @return void
*/
- public function all($status = 'undone', $projectID = 0, $orderBy = 'order_desc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1)
+ public function all($status = 'undone', $projectID = 0, $orderBy = 'path_asc,id_asc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1)
{
$this->app->loadLang('my');
$this->app->loadLang('programplan');
@@ -2484,17 +2484,17 @@ class project extends control
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
- $this->view->title = $this->lang->project->allProject;
- $this->view->position[] = $this->lang->project->allProject;
+ $this->view->title = $this->lang->project->allProject;
+ $this->view->position[] = $this->lang->project->allProject;
- $this->view->projectStats = $this->project->getExecutionStats($this->session->PRJ, $status == 'byproduct' ? 'all' : $status, $productID, 0, 30, $orderBy, $pager);
- $this->view->products = array(0 => $this->lang->product->select) + $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
- $this->view->productID = $productID;
- $this->view->projectID = $projectID;
- $this->view->pager = $pager;
- $this->view->orderBy = $orderBy;
- $this->view->users = $this->loadModel('user')->getPairs('noletter');
- $this->view->status = $status;
+ $this->view->executionStats = $this->project->getExecutionStats($this->session->PRJ, $status, $productID, 0, 30, $orderBy, $pager);
+ $this->view->products = array(0 => $this->lang->product->select) + $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
+ $this->view->productID = $productID;
+ $this->view->projectID = $projectID;
+ $this->view->pager = $pager;
+ $this->view->orderBy = $orderBy;
+ $this->view->users = $this->loadModel('user')->getPairs('noletter');
+ $this->view->status = $status;
$this->display();
}
diff --git a/module/project/model.php b/module/project/model.php
index 8e738f84dd..bed6d7b3aa 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -999,7 +999,7 @@ class projectModel extends model
* @access public
* @return void
*/
- public function getExecutionStats($projectID = 0, $status = 'undone', $productID = 0, $branch = 0, $itemCounts = 30, $orderBy = 'order_desc', $pager = null)
+ public function getExecutionStats($projectID = 0, $status = 'undone', $productID = 0, $branch = 0, $itemCounts = 30, $orderBy = 'path_asc,id_asc', $pager = null)
{
if(empty($productID))
{
@@ -1007,7 +1007,7 @@ class projectModel extends model
->where('project')->eq($projectID)
->andWhere('type')->eq('stage')
->andWhere('deleted')->eq('0')
- ->orderBy('path_desc,id_asc')
+ ->orderBy($orderBy)
->page($pager)
->fetchAll('id');
}
@@ -1019,7 +1019,7 @@ class projectModel extends model
->andWhere('t2.project')->eq($projectID)
->andWhere('t2.type')->eq('stage')
->andWhere('t2.deleted')->eq('0')
- ->orderBy('t2.parent_desc,t2.id_asc')
+ ->orderBy($orderBy)
->page($pager)
->fetchAll('id');
}
diff --git a/module/project/view/all.html.php b/module/project/view/all.html.php
index 98868b2c0f..57c02880ab 100644
--- a/module/project/view/all.html.php
+++ b/module/project/view/all.html.php
@@ -69,54 +69,54 @@
-
-
+
+
|
-
+
- id);?>
+ id);?>
|
- ' title='name?>'>
+ | ' title='name?>'>
delay)) echo "{$lang->project->delayed} ";
- echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name);
+ if(isset($execution->delay)) echo "{$lang->project->delayed} ";
+ echo html::a($this->createLink('project', 'view', 'project=' . $execution->id), $execution->name);
?>
- children)):?>
-
+ children)):?>
+
|
- code;?> |
- PM);?> |
- end;?> |
- processStatus('project', $project);?>
+ code;?> |
+ PM);?> |
+ end;?> |
+ processStatus('project', $execution);?>
-
+
|
- hours->totalEstimate;?> |
- hours->totalConsumed;?> |
- hours->totalLeft;?> |
+ hours->totalEstimate;?> |
+ hours->totalConsumed;?> |
+ hours->totalLeft;?> |
-
- hours->progress;?>%
+
+ hours->progress;?>%
|
- burns);?>'> |
+ burns);?>'> |
|
- children)):?>
+ children)):?>
- children as $key => $child):?>
+ children as $key => $child):?>
- children)) ? ' table-child-bottom' : '';?>
-
+ children)) ? ' table-child-bottom' : '';?>
+
|
@@ -161,7 +161,7 @@
|
-
+