Merge branch 'master' of https://github.com/easysoft/zentaopms

config/zentaopms.php

@@ -43,24 +43,20 @@ $config->projectCommonList['vi'][0] = 'Lặp lại';
 $config->projectCommonList['vi'][1] = 'Sprint';
 $config->projectCommonList['vi'][2] = 'Giai đoạn';
 
-/* Story common list. */
-$config->storyCommonList['zh-cn'][0] = '需求';
-$config->storyCommonList['zh-cn'][1] = '故事';
+$config->URStory['zh-cn'] = '用户需求';
+$config->SRStory['zh-cn'] = '软件需求';
 
-$config->storyCommonList['zh-tw'][0] = '需求';
-$config->storyCommonList['zh-tw'][1] = '故事';
+$config->URStory['en'] = 'Requirement';
+$config->SRStory['en'] = 'Story';
 
-$config->storyCommonList['en'][0] = 'Story';
-$config->storyCommonList['en'][1] = 'Story';
+$config->URStory['vi'] = 'Requirement';
+$config->SRStory['vi'] = 'Story';
 
-$config->storyCommonList['de'][0] = 'Story';
-$config->storyCommonList['de'][1] = 'Story';
+$config->URStory['fr'] = 'Requirement';
+$config->SRStory['fr'] = 'Story';
 
-$config->storyCommonList['fr'][0] = 'Story';
-$config->storyCommonList['fr'][1] = 'Story';
-
-$config->storyCommonList['vi'][0] = 'Câu chuyện';
-$config->storyCommonList['vi'][1] = 'Câu chuyện';
+$config->URStory['de'] = 'Requirement';
+$config->SRStory['de'] = 'Story';
 
 /* Story common list. */
 $config->hourPointCommonList['zh-cn'][0] = '故事点';

db/update20.0.alpha1.sql

@@ -5,3 +5,16 @@ MODIFY COLUMN `duration` decimal(10, 2) UNSIGNED NOT NULL AFTER `productivity`,
 MODIFY COLUMN `unitLaborCost` decimal(10, 2) UNSIGNED NOT NULL AFTER `duration`,
 MODIFY COLUMN `totalLaborCost` decimal(10, 2) UNSIGNED NOT NULL AFTER `unitLaborCost`,
 MODIFY COLUMN `dayHour` decimal(10, 2) NULL DEFAULT NULL AFTER `deleted`;
+
+ALTER TABLE `zt_project` ADD `storyConcept` smallint(5) unsigned NOT NULL AFTER `days`;
+ALTER TABLE `zt_product` ADD `storyConcept` smallint(5) NOT NULL AFTER `RD`;
+
+INSERT INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`) VALUES
+('zh-cn', 'custom', 'URList', '1', '用户需求', '1'),
+('zh-cn', 'custom', 'URList', '2', '用需', '1'),
+('zh-cn', 'custom', 'URList', '3', '需求', '1'),
+('zh-cn', 'custom', 'URList', '4', '史诗', '1'),
+('zh-cn', 'custom', 'SRList', '1', '软件需求', '1'),
+('zh-cn', 'custom', 'SRList', '2', '软需', '1'),
+('zh-cn', 'custom', 'SRList', '3', '故事', '1'),
+('zh-cn', 'custom', 'SRList', '4', '故事', '1');

db/zentao.sql

@@ -671,6 +671,7 @@ CREATE TABLE IF NOT EXISTS `zt_product` (
   `PO` varchar(30) NOT NULL,
   `QD` varchar(30) NOT NULL,
   `RD` varchar(30) NOT NULL,
+  `storyConcept` smallint(5) NOT NULL,
   `acl` enum('open','private','custom') NOT NULL default 'open',
   `whitelist` text NOT NULL,
   `createdBy` varchar(30) NOT NULL,
@@ -723,6 +724,7 @@ CREATE TABLE IF NOT EXISTS `zt_project` (
   `realBegan` date NOT NULL,
   `realEnd` date NOT NULL,
   `days` smallint(5) unsigned NOT NULL,
+  `storyConcept` smallint(5) unsigned NOT NULL,
   `status` varchar(10) NOT NULL,
   `subStatus` varchar(30) NOT NULL DEFAULT '',
   `statge` enum('1','2','3','4','5') NOT NULL DEFAULT '1',
@@ -4070,9 +4072,18 @@ INSERT INTO `zt_stage` (`name`,`percent`,`type`,`createdBy`,`createdDate`,`edite
 ('发布','10','release','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'),
 ('总结评审','5','review','admin','2020-02-08 21:08:45','admin','2020-02-12 13:50:27','0');
 
+INSERT INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`) VALUES
+('zh-cn', 'custom', 'URList', '1', '用户需求', '1'),
+('zh-cn', 'custom', 'URList', '2', '用需', '1'),
+('zh-cn', 'custom', 'URList', '3', '需求', '1'),
+('zh-cn', 'custom', 'URList', '4', '史诗', '1'),
+('zh-cn', 'custom', 'SRList', '1', '软件需求', '1'),
+('zh-cn', 'custom', 'SRList', '2', '软需', '1'),
+('zh-cn', 'custom', 'SRList', '3', '故事', '1'),
+('zh-cn', 'custom', 'SRList', '4', '故事', '1');
+
 INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES 
 ('system','custom','','hourPoint','1'),
-('system','custom','','URAndSR','1'),
-('system','custom','common','URSRName','{\"URCommon\":{\"zh-cn\":\"\\u7528\\u6237\\u9700\\u6c42\"},\"SRCommon\":{\"zh-cn\":\"\\u8f6f\\u4ef6\\u9700\\u6c42\"}}');
+('system','custom','','URAndSR','1');
 INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'common', '', 'CRProduct', '1');
 INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'common', '', 'CRProject', '1');

framework/router.class.php

@@ -115,7 +115,7 @@ class router extends baseRouter
         /* Set productCommon and projectCommon for flow. */
         if($moduleName == 'common')
         {
-            $productProject = $storyRequirement = $hourPoint = false;
+            $productProject = $hourPoint = false;
             if($this->dbh and !empty($this->config->db->name))
             {
                 global $config;
@@ -126,7 +126,7 @@ class router extends baseRouter
                 $commonSettings = array();
                 try
                 {
-                    $commonSettings = $this->dbh->query('SELECT section, `key`, value FROM' . TABLE_CONFIG . "WHERE `owner`='system' AND `module`='custom' and `key` in ('productProject','URAndSR','URSRName','storyRequirement','hourPoint')")->fetchAll();
+                    $commonSettings = $this->dbh->query('SELECT section, `key`, value FROM' . TABLE_CONFIG . "WHERE `owner`='system' AND `module`='custom' and `key` in ('productProject','hourPoint','URAndSR')")->fetchAll();
                 }
                 catch (PDOException $exception)
                 {
@@ -147,22 +147,14 @@ class router extends baseRouter
                 }
             }
 
-            $productIndex = $storyIndex = $hourIndex = $planIndex = $URAndSR = 0;
+            $productIndex = $hourIndex = $planIndex = $URAndSR = 0;
             $projectIndex = empty($this->config->isINT) ? 0 : 1;
 
             foreach($commonSettings as $setting)
             {
                 if($setting->key == 'productProject')   list($productIndex, $projectIndex) = explode('_',  $setting->value);
-                if($setting->key == 'storyRequirement') $storyIndex = $setting->value;
                 if($setting->key == 'hourPoint')        $hourIndex  = $setting->value;
                 if($setting->key == 'URAndSR')          $URAndSR    = $setting->value;
-
-                if($setting->key == 'URSRName')
-                {
-                    $URSRName = json_decode($setting->value, true);
-                    if(isset($URSRName['URCommon'][$this->clientLang])) $lang->URCommon = $URSRName['URCommon'][$this->clientLang];
-                    if(isset($URSRName['SRCommon'][$this->clientLang])) $lang->SRCommon = $URSRName['SRCommon'][$this->clientLang];
-                }
             }
 
             $model = new stdclass();
@@ -174,21 +166,43 @@ class router extends baseRouter
                 $projectIndex = 2;
             }
 
-            $config->storyCommon = $storyIndex;
-            $config->URAndSR     = $URAndSR;
+            $config->URAndSR = $URAndSR;
 
-            /* Set productCommon, projectCommon, storyCommon, hourCommon and planCommon. Default english lang. */
+            /* Set productCommon, projectCommon, hourCommon and planCommon. Default english lang. */
             $lang->productCommon = isset($this->config->productCommonList[$this->clientLang][(int)$productIndex]) ? $this->config->productCommonList[$this->clientLang][(int)$productIndex] : $this->config->productCommonList['en'][(int)$productIndex];
             $lang->projectCommon = isset($this->config->projectCommonList[$this->clientLang][(int)$projectIndex]) ? $this->config->projectCommonList[$this->clientLang][(int)$projectIndex] : $this->config->projectCommonList['en'][(int)$$projectIndex];
-            $lang->storyCommon   = isset($this->config->storyCommonList[$this->clientLang][(int)$storyIndex])     ? $this->config->storyCommonList[$this->clientLang][(int)$storyIndex]     : $this->config->storyCommonList['en'][(int)$storyIndex];
             $lang->hourCommon    = isset($this->config->hourPointCommonList[$this->clientLang][(int)$hourIndex])  ? $this->config->hourPointCommonList[$this->clientLang][(int)$hourIndex]  : $this->config->hourPointCommonList['en'][(int)$hourIndex];
             $lang->planCommon    = isset($this->config->planCommonList[$this->clientLang][(int)$planIndex])       ? $this->config->planCommonList[$this->clientLang][(int)$planIndex]       : $this->config->planCommonList['en'][(int)$planIndex];
 
-            if($storyIndex == 0 and isset($URAndSR))
-            {
-                $config->URAndSR = $URAndSR;
-                if(!empty($URAndSR) and !empty($lang->SRCommon)) $lang->storyCommon = $lang->SRCommon;
+            $URLists = $this->dbh->query('SELECT `key`, `value` FROM' . TABLE_LANG . "WHERE module = 'custom' and section = 'URList' and lang = \"{$this->clientLang}\"")->fetchAll();
+            $SRLists = $this->dbh->query('SELECT `key`, `value` FROM' . TABLE_LANG . "WHERE module = 'custom' and section = 'SRList' and lang = \"{$this->clientLang}\"")->fetchAll();
+
+            $URList  = array();
+            $SRList  = array();
+            foreach($URLists as $pair) $URList[$pair->key] = $pair->value;
+            foreach($SRLists as $pair) $SRList[$pair->key] = $pair->value;
+
+            $lang->projectURCommon = $config->URStory[$this->clientLang];
+            $lang->productURCommon = $config->URStory[$this->clientLang];
+            $lang->projectSRCommon = $config->SRStory[$this->clientLang];
+            $lang->productSRCommon = $config->SRStory[$this->clientLang];
+
+            $projectID = $this->session->PRJ;
+            if($projectID)
+            {    
+                $storyConcept = $this->dbh->query('SELECT `storyConcept` FROM' . TABLE_PROJECT . "WHERE id = {$projectID}")->fetch();
+                $lang->projectURCommon = zget($URList, $storyConcept->storyConcept, $config->URStory[$this->clientLang]);
+                $lang->projectSRCommon = zget($SRList, $storyConcept->storyConcept, $config->SRStory[$this->clientLang]);
+            }    
+
+            $productID = $this->session->product;
+            if($productID)
+            {    
+                $storyConcept = $this->dbh->query('SELECT `storyConcept` FROM' . TABLE_PRODUCT . "WHERE id = {$productID}")->fetch();
+                $lang->productURCommon = zget($URList, $storyConcept->storyConcept, $config->URStory[$this->clientLang]);
+                $lang->productSRCommon = zget($SRList, $storyConcept->storyConcept, $config->SRStory[$this->clientLang]);
             }
+
         }
 
         parent::loadLang($moduleName, $appName);
@@ -216,6 +230,7 @@ class router extends baseRouter
                 unset($nullValue);
             }
         }
+
         return $lang;
     }
 

module/action/lang/zh-cn.php

@@ -65,7 +65,7 @@ $lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth;
 $lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
 
 $lang->action->objectTypes['product']     = $lang->productCommon;
-$lang->action->objectTypes['story']       = $lang->storyCommon;
+$lang->action->objectTypes['story']       = $lang->productSRCommon;
 $lang->action->objectTypes['productplan'] = $lang->planCommon;
 $lang->action->objectTypes['release']     = '发布';
 $lang->action->objectTypes['program']     = '项目';
@@ -109,7 +109,7 @@ $lang->action->desc->commented      = '$date, 由 <strong>$actor</strong> 添加
 $lang->action->desc->activated      = '$date, 由 <strong>$actor</strong> 激活。' . "\n";
 $lang->action->desc->blocked        = '$date, 由 <strong>$actor</strong> 阻塞。' . "\n";
 $lang->action->desc->moved          = '$date, 由 <strong>$actor</strong> 移动，之前为 "$extra"。' . "\n";
-$lang->action->desc->confirmed      = '$date, 由 <strong>$actor</strong> 确认' . $lang->storyCommon . '变动，最新版本为<strong>#$extra</strong>。' . "\n";
+$lang->action->desc->confirmed      = '$date, 由 <strong>$actor</strong> 确认' . $lang->productSRCommon . '变动，最新版本为<strong>#$extra</strong>。' . "\n";
 $lang->action->desc->caseconfirmed  = '$date, 由 <strong>$actor</strong> 确认用例变动，最新版本为<strong>#$extra</strong>。' . "\n";
 $lang->action->desc->bugconfirmed   = '$date, 由 <strong>$actor</strong> 确认Bug。' . "\n";
 $lang->action->desc->frombug        = '$date, 由 <strong>$actor</strong> Bug转化而来，Bug编号为 <strong>$extra</strong>。';
@@ -172,10 +172,10 @@ $lang->action->label->blocked             = '阻塞了';
 $lang->action->label->resolved            = '解决了';
 $lang->action->label->reviewed            = '评审了';
 $lang->action->label->moved               = '移动了';
-$lang->action->label->confirmed           = "确认了{$lang->storyCommon}";
+$lang->action->label->confirmed           = "确认了{$lang->productSRCommon}";
 $lang->action->label->bugconfirmed        = '确认了';
-$lang->action->label->tostory             = "转{$lang->storyCommon}";
-$lang->action->label->frombug             = "转{$lang->storyCommon}";
+$lang->action->label->tostory             = "转{$lang->productSRCommon}";
+$lang->action->label->frombug             = "转{$lang->productSRCommon}";
 $lang->action->label->fromlib             = '从用例库导入';
 $lang->action->label->totask              = '转任务';
 $lang->action->label->svncommited         = '提交代码';
@@ -193,10 +193,10 @@ $lang->action->label->linkrelatedbug      = "关联了相关Bug";
 $lang->action->label->unlinkrelatedbug    = "移除了相关Bug";
 $lang->action->label->linkrelatedcase     = "关联了相关用例";
 $lang->action->label->unlinkrelatedcase   = "移除了相关用例";
-$lang->action->label->linkrelatedstory    = "关联了相关{$lang->storyCommon}";
-$lang->action->label->unlinkrelatedstory  = "移除了相关{$lang->storyCommon}";
-$lang->action->label->subdividestory      = "细分了{$lang->storyCommon}";
-$lang->action->label->unlinkchildstory    = "移除了细分{$lang->storyCommon}";
+$lang->action->label->linkrelatedstory    = "关联了相关{$lang->productSRCommon}";
+$lang->action->label->unlinkrelatedstory  = "移除了相关{$lang->productSRCommon}";
+$lang->action->label->subdividestory      = "细分了{$lang->productSRCommon}";
+$lang->action->label->unlinkchildstory    = "移除了细分{$lang->productSRCommon}";
 $lang->action->label->started             = '开始了';
 $lang->action->label->restarted           = '继续了';
 $lang->action->label->recordestimate      = '记录了工时';
@@ -266,22 +266,22 @@ $lang->action->dynamicAction->release['edited']            = '编辑发布';
 $lang->action->dynamicAction->release['changestatus']      = '修改发布状态';
 $lang->action->dynamicAction->release['undeleted']         = '还原发布';
 $lang->action->dynamicAction->release['hidden']            = '隐藏发布';
-$lang->action->dynamicAction->story['opened']              = "创建{$lang->storyCommon}";
-$lang->action->dynamicAction->story['edited']              = "编辑{$lang->storyCommon}";
-$lang->action->dynamicAction->story['activated']           = "激活{$lang->storyCommon}";
-$lang->action->dynamicAction->story['reviewed']            = "评审{$lang->storyCommon}";
-$lang->action->dynamicAction->story['closed']              = "关闭{$lang->storyCommon}";
-$lang->action->dynamicAction->story['assigned']            = "指派{$lang->storyCommon}";
-$lang->action->dynamicAction->story['changed']             = "变更{$lang->storyCommon}";
-$lang->action->dynamicAction->story['linked2plan']         = "{$lang->storyCommon}关联{$lang->planCommon}";
-$lang->action->dynamicAction->story['unlinkedfromplan']    = "{$lang->planCommon}移除{$lang->storyCommon}";
-$lang->action->dynamicAction->story['linked2release']      = "{$lang->storyCommon}关联发布";
-$lang->action->dynamicAction->story['unlinkedfromrelease'] = "发布移除{$lang->storyCommon}";
-$lang->action->dynamicAction->story['linked2build']        = "{$lang->storyCommon}关联版本";
-$lang->action->dynamicAction->story['unlinkedfrombuild']   = "版本移除{$lang->storyCommon}";
+$lang->action->dynamicAction->story['opened']              = "创建{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['edited']              = "编辑{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['activated']           = "激活{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['reviewed']            = "评审{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['closed']              = "关闭{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['assigned']            = "指派{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['changed']             = "变更{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['linked2plan']         = "{$lang->productSRCommon}关联{$lang->planCommon}";
+$lang->action->dynamicAction->story['unlinkedfromplan']    = "{$lang->planCommon}移除{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['linked2release']      = "{$lang->productSRCommon}关联发布";
+$lang->action->dynamicAction->story['unlinkedfromrelease'] = "发布移除{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['linked2build']        = "{$lang->productSRCommon}关联版本";
+$lang->action->dynamicAction->story['unlinkedfrombuild']   = "版本移除{$lang->productSRCommon}";
 $lang->action->dynamicAction->story['unlinkedfromproject'] = '移除项目';
-$lang->action->dynamicAction->story['undeleted']           = "还原{$lang->storyCommon}";
-$lang->action->dynamicAction->story['hidden']              = "隐藏{$lang->storyCommon}";
+$lang->action->dynamicAction->story['undeleted']           = "还原{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['hidden']              = "隐藏{$lang->productSRCommon}";
 
 $lang->action->dynamicAction->project['opened']            = '创建' . $lang->projectCommon;
 $lang->action->dynamicAction->project['edited']            = '编辑' . $lang->projectCommon;
@@ -299,7 +299,7 @@ $lang->action->dynamicAction->task['opened']               = '创建任务';
 $lang->action->dynamicAction->task['edited']               = '编辑任务';
 $lang->action->dynamicAction->task['commented']            = '备注任务';
 $lang->action->dynamicAction->task['assigned']             = '指派任务';
-$lang->action->dynamicAction->task['confirmed']            = "确认{$lang->storyCommon}变更";
+$lang->action->dynamicAction->task['confirmed']            = "确认{$lang->productSRCommon}变更";
 $lang->action->dynamicAction->task['started']              = '开始任务';
 $lang->action->dynamicAction->task['finished']             = '完成任务';
 $lang->action->dynamicAction->task['recordestimate']       = '记录工时';
@@ -336,8 +336,8 @@ $lang->action->dynamicAction->bug['resolved']              = '解决Bug';
 $lang->action->dynamicAction->bug['undeleted']             = '还原Bug';
 $lang->action->dynamicAction->bug['hidden']                = '隐藏Bug';
 $lang->action->dynamicAction->bug['deleted']               = '删除Bug';
-$lang->action->dynamicAction->bug['confirmed']             = "确认{$lang->storyCommon}变更";
-$lang->action->dynamicAction->bug['tostory']               = "转{$lang->storyCommon}";
+$lang->action->dynamicAction->bug['confirmed']             = "确认{$lang->productSRCommon}变更";
+$lang->action->dynamicAction->bug['tostory']               = "转{$lang->productSRCommon}";
 $lang->action->dynamicAction->bug['totask']                = '转任务';
 $lang->action->dynamicAction->bug['linked2plan']           = "Bug关联{$lang->planCommon}";
 $lang->action->dynamicAction->bug['unlinkedfromplan']      = "{$lang->planCommon}移除Bug";
@@ -357,7 +357,7 @@ $lang->action->dynamicAction->case['deleted']              = '删除用例';
 $lang->action->dynamicAction->case['undeleted']            = '还原用例';
 $lang->action->dynamicAction->case['hidden']               = '隐藏用例';
 $lang->action->dynamicAction->case['reviewed']             = '评审用例';
-$lang->action->dynamicAction->case['confirmed']            = "确认{$lang->storyCommon}变更";
+$lang->action->dynamicAction->case['confirmed']            = "确认{$lang->productSRCommon}变更";
 $lang->action->dynamicAction->case['fromlib']              = '从用例库导入';
 $lang->action->dynamicAction->testreport['opened']         = '创建测试报告';
 $lang->action->dynamicAction->testreport['edited']         = '编辑测试报告';
@@ -399,7 +399,7 @@ $lang->action->dynamicAction->entry['edited']              = '编辑应用';
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
 $lang->action->label->productplan = "{$lang->planCommon}|productplan|view|productID=%s";
 $lang->action->label->release     = '发布|release|view|productID=%s';
-$lang->action->label->story       = "{$lang->storyCommon}|story|view|storyID=%s";
+$lang->action->label->story       = "{$lang->productSRCommon}|story|view|storyID=%s";
 $lang->action->label->program     = "项目|program|browse|";
 $lang->action->label->project     = "{$lang->projectCommon}|project|view|projectID=%s";
 $lang->action->label->task        = '任务|task|view|taskID=%s';
@@ -430,7 +430,7 @@ $lang->action->search->objectTypeList['bug']         = 'Bug';
 $lang->action->search->objectTypeList['case']        = '用例';
 $lang->action->search->objectTypeList['caseresult']  = '用例结果';
 $lang->action->search->objectTypeList['stepresult']  = '用例步骤';
-$lang->action->search->objectTypeList['story']       = $lang->storyCommon;
+$lang->action->search->objectTypeList['story']       = $lang->productSRCommon;
 $lang->action->search->objectTypeList['task']        = '任务';
 $lang->action->search->objectTypeList['testtask']    = '测试单';
 $lang->action->search->objectTypeList['user']        = '用户';

module/action/lang/zh-tw.php

@@ -65,7 +65,7 @@ $lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth;
 $lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
 
 $lang->action->objectTypes['product']     = $lang->productCommon;
-$lang->action->objectTypes['story']       = $lang->storyCommon;
+$lang->action->objectTypes['story']       = $lang->productSRCommon;
 $lang->action->objectTypes['productplan'] = '計劃';
 $lang->action->objectTypes['release']     = '發佈';
 $lang->action->objectTypes['project']     = $lang->projectCommon;
@@ -108,7 +108,7 @@ $lang->action->desc->commented      = '$date, 由 <strong>$actor</strong> 添加
 $lang->action->desc->activated      = '$date, 由 <strong>$actor</strong> 激活。' . "\n";
 $lang->action->desc->blocked        = '$date, 由 <strong>$actor</strong> 阻塞。' . "\n";
 $lang->action->desc->moved          = '$date, 由 <strong>$actor</strong> 移動，之前為 "$extra"。' . "\n";
-$lang->action->desc->confirmed      = '$date, 由 <strong>$actor</strong> 確認' . $lang->storyCommon . '變動，最新版本為<strong>#$extra</strong>。' . "\n";
+$lang->action->desc->confirmed      = '$date, 由 <strong>$actor</strong> 確認' . $lang->productSRCommon . '變動，最新版本為<strong>#$extra</strong>。' . "\n";
 $lang->action->desc->caseconfirmed  = '$date, 由 <strong>$actor</strong> 確認用例變動，最新版本為<strong>#$extra</strong>。' . "\n";
 $lang->action->desc->bugconfirmed   = '$date, 由 <strong>$actor</strong> 確認Bug。' . "\n";
 $lang->action->desc->frombug        = '$date, 由 <strong>$actor</strong> Bug轉化而來，Bug編號為 <strong>$extra</strong>。';
@@ -171,10 +171,10 @@ $lang->action->label->blocked             = '阻塞了';
 $lang->action->label->resolved            = '解決了';
 $lang->action->label->reviewed            = '評審了';
 $lang->action->label->moved               = '移動了';
-$lang->action->label->confirmed           = "確認了{$lang->storyCommon}";
+$lang->action->label->confirmed           = "確認了{$lang->productSRCommon}";
 $lang->action->label->bugconfirmed        = '確認了';
-$lang->action->label->tostory             = "轉{$lang->storyCommon}";
-$lang->action->label->frombug             = "轉{$lang->storyCommon}";
+$lang->action->label->tostory             = "轉{$lang->productSRCommon}";
+$lang->action->label->frombug             = "轉{$lang->productSRCommon}";
 $lang->action->label->fromlib             = '從用例庫導入';
 $lang->action->label->totask              = '轉任務';
 $lang->action->label->svncommited         = '提交代碼';
@@ -192,10 +192,10 @@ $lang->action->label->linkrelatedbug      = "關聯了相關Bug";
 $lang->action->label->unlinkrelatedbug    = "移除了相關Bug";
 $lang->action->label->linkrelatedcase     = "關聯了相關用例";
 $lang->action->label->unlinkrelatedcase   = "移除了相關用例";
-$lang->action->label->linkrelatedstory    = "關聯了相關{$lang->storyCommon}";
-$lang->action->label->unlinkrelatedstory  = "移除了相關{$lang->storyCommon}";
-$lang->action->label->subdividestory      = "細分了{$lang->storyCommon}";
-$lang->action->label->unlinkchildstory    = "移除了細分{$lang->storyCommon}";
+$lang->action->label->linkrelatedstory    = "關聯了相關{$lang->productSRCommon}";
+$lang->action->label->unlinkrelatedstory  = "移除了相關{$lang->productSRCommon}";
+$lang->action->label->subdividestory      = "細分了{$lang->productSRCommon}";
+$lang->action->label->unlinkchildstory    = "移除了細分{$lang->productSRCommon}";
 $lang->action->label->started             = '開始了';
 $lang->action->label->restarted           = '繼續了';
 $lang->action->label->recordestimate      = '記錄了工時';
@@ -253,22 +253,22 @@ $lang->action->dynamicAction->release['edited']            = '編輯發佈';
 $lang->action->dynamicAction->release['changestatus']      = '修改發佈狀態';
 $lang->action->dynamicAction->release['undeleted']         = '還原發佈';
 $lang->action->dynamicAction->release['hidden']            = '隱藏發佈';
-$lang->action->dynamicAction->story['opened']              = "創建{$lang->storyCommon}";
-$lang->action->dynamicAction->story['edited']              = "編輯{$lang->storyCommon}";
-$lang->action->dynamicAction->story['activated']           = "激活{$lang->storyCommon}";
-$lang->action->dynamicAction->story['reviewed']            = "評審{$lang->storyCommon}";
-$lang->action->dynamicAction->story['closed']              = "關閉{$lang->storyCommon}";
-$lang->action->dynamicAction->story['assigned']            = "指派{$lang->storyCommon}";
-$lang->action->dynamicAction->story['changed']             = "變更{$lang->storyCommon}";
-$lang->action->dynamicAction->story['linked2plan']         = "{$lang->storyCommon}關聯計劃";
-$lang->action->dynamicAction->story['unlinkedfromplan']    = "計劃移除{$lang->storyCommon}";
-$lang->action->dynamicAction->story['linked2release']      = "{$lang->storyCommon}關聯發佈";
-$lang->action->dynamicAction->story['unlinkedfromrelease'] = "發佈移除{$lang->storyCommon}";
-$lang->action->dynamicAction->story['linked2build']        = "{$lang->storyCommon}關聯版本";
-$lang->action->dynamicAction->story['unlinkedfrombuild']   = "版本移除{$lang->storyCommon}";
+$lang->action->dynamicAction->story['opened']              = "創建{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['edited']              = "編輯{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['activated']           = "激活{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['reviewed']            = "評審{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['closed']              = "關閉{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['assigned']            = "指派{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['changed']             = "變更{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['linked2plan']         = "{$lang->productSRCommon}關聯計劃";
+$lang->action->dynamicAction->story['unlinkedfromplan']    = "計劃移除{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['linked2release']      = "{$lang->productSRCommon}關聯發佈";
+$lang->action->dynamicAction->story['unlinkedfromrelease'] = "發佈移除{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['linked2build']        = "{$lang->productSRCommon}關聯版本";
+$lang->action->dynamicAction->story['unlinkedfrombuild']   = "版本移除{$lang->productSRCommon}";
 $lang->action->dynamicAction->story['unlinkedfromproject'] = '移除項目';
-$lang->action->dynamicAction->story['undeleted']           = "還原{$lang->storyCommon}";
-$lang->action->dynamicAction->story['hidden']              = "隱藏{$lang->storyCommon}";
+$lang->action->dynamicAction->story['undeleted']           = "還原{$lang->productSRCommon}";
+$lang->action->dynamicAction->story['hidden']              = "隱藏{$lang->productSRCommon}";
 
 $lang->action->dynamicAction->project['opened']            = '創建' . $lang->projectCommon;
 $lang->action->dynamicAction->project['edited']            = '編輯' . $lang->projectCommon;
@@ -286,7 +286,7 @@ $lang->action->dynamicAction->task['opened']               = '創建任務';
 $lang->action->dynamicAction->task['edited']               = '編輯任務';
 $lang->action->dynamicAction->task['commented']            = '備註任務';
 $lang->action->dynamicAction->task['assigned']             = '指派任務';
-$lang->action->dynamicAction->task['confirmed']            = "確認{$lang->storyCommon}變更";
+$lang->action->dynamicAction->task['confirmed']            = "確認{$lang->productSRCommon}變更";
 $lang->action->dynamicAction->task['started']              = '開始任務';
 $lang->action->dynamicAction->task['finished']             = '完成任務';
 $lang->action->dynamicAction->task['recordestimate']       = '記錄工時';
@@ -323,8 +323,8 @@ $lang->action->dynamicAction->bug['resolved']              = '解決Bug';
 $lang->action->dynamicAction->bug['undeleted']             = '還原Bug';
 $lang->action->dynamicAction->bug['hidden']                = '隱藏Bug';
 $lang->action->dynamicAction->bug['deleted']               = '刪除Bug';
-$lang->action->dynamicAction->bug['confirmed']             = "確認{$lang->storyCommon}變更";
-$lang->action->dynamicAction->bug['tostory']               = "轉{$lang->storyCommon}";
+$lang->action->dynamicAction->bug['confirmed']             = "確認{$lang->productSRCommon}變更";
+$lang->action->dynamicAction->bug['tostory']               = "轉{$lang->productSRCommon}";
 $lang->action->dynamicAction->bug['totask']                = '轉任務';
 $lang->action->dynamicAction->bug['linked2plan']           = 'Bug關聯計劃';
 $lang->action->dynamicAction->bug['unlinkedfromplan']      = '計劃移除Bug';
@@ -344,7 +344,7 @@ $lang->action->dynamicAction->case['deleted']              = '刪除用例';
 $lang->action->dynamicAction->case['undeleted']            = '還原用例';
 $lang->action->dynamicAction->case['hidden']               = '隱藏用例';
 $lang->action->dynamicAction->case['reviewed']             = '評審用例';
-$lang->action->dynamicAction->case['confirmed']            = "確認{$lang->storyCommon}變更";
+$lang->action->dynamicAction->case['confirmed']            = "確認{$lang->productSRCommon}變更";
 $lang->action->dynamicAction->case['fromlib']              = '從用例庫導入';
 $lang->action->dynamicAction->testreport['opened']         = '創建測試報告';
 $lang->action->dynamicAction->testreport['edited']         = '編輯測試報告';
@@ -386,7 +386,7 @@ $lang->action->dynamicAction->entry['edited']              = '編輯應用';
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
 $lang->action->label->productplan = '計劃|productplan|view|productID=%s';
 $lang->action->label->release     = '發佈|release|view|productID=%s';
-$lang->action->label->story       = "{$lang->storyCommon}|story|view|storyID=%s";
+$lang->action->label->story       = "{$lang->productSRCommon}|story|view|storyID=%s";
 $lang->action->label->project     = "{$lang->projectCommon}|project|view|projectID=%s";
 $lang->action->label->task        = '任務|task|view|taskID=%s';
 $lang->action->label->build       = '版本|build|view|buildID=%s';
@@ -413,7 +413,7 @@ $lang->action->search->objectTypeList['bug']         = 'Bug';
 $lang->action->search->objectTypeList['case']        = '用例';
 $lang->action->search->objectTypeList['caseresult']  = '用例結果';
 $lang->action->search->objectTypeList['stepresult']  = '用例步驟';
-$lang->action->search->objectTypeList['story']       = $lang->storyCommon;
+$lang->action->search->objectTypeList['story']       = $lang->productSRCommon;
 $lang->action->search->objectTypeList['task']        = '任務';
 $lang->action->search->objectTypeList['testtask']    = '測試單';
 $lang->action->search->objectTypeList['user']        = '用戶';

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);
     }
 
     /**

module/block/lang/de.php

@@ -80,7 +80,7 @@ $lang->block->hidden             = 'Verstecken';
 $lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <em>%s</em> %s <a href='%s'>%s</a></span>";
 
 $lang->block->productName  = $lang->productCommon . ' Name';
-$lang->block->totalStory   = 'The Total ' . $lang->storyCommon;
+$lang->block->totalStory   = 'The Total ' . $lang->productSRCommon;
 $lang->block->totalBug     = 'The Total Bug';
 $lang->block->totalRelease = 'Release The Number';
 

module/block/lang/en.php

@@ -80,7 +80,7 @@ $lang->block->hidden             = 'Hide';
 $lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <em>%s</em> %s <a href='%s' title='%s'>%s</a></span>";
 
 $lang->block->productName  = $lang->productCommon . ' Name';
-$lang->block->totalStory   = 'The Total ' . $lang->storyCommon;
+$lang->block->totalStory   = 'The Total ' . $lang->productSRCommon;
 $lang->block->totalBug     = 'The Total Bug';
 $lang->block->totalRelease = 'Release The Number';
 

module/block/lang/fr.php

@@ -80,7 +80,7 @@ $lang->block->hidden             = 'Masquer';
 $lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <em>%s</em> %s <a href='%s' title='%s'>%s</a></span>";
 
 $lang->block->productName  = $lang->productCommon . ' Name';
-$lang->block->totalStory   = 'The Total ' . $lang->storyCommon;
+$lang->block->totalStory   = 'The Total ' . $lang->productSRCommon;
 $lang->block->totalBug     = 'The Total Bug';
 $lang->block->totalRelease = 'Release The Number';
 

module/block/lang/vi.php

@@ -80,7 +80,7 @@ $lang->block->hidden             = 'Ẩn';
 $lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <em>%s</em> %s <a href='%s' title='%s'>%s</a></span>";
 
 $lang->block->productName  = $lang->productCommon . ' Name';
-$lang->block->totalStory   = 'The Total ' . $lang->storyCommon;
+$lang->block->totalStory   = 'The Total ' . $lang->productSRCommon;
 $lang->block->totalBug     = 'The Total Bug';
 $lang->block->totalRelease = 'Release The Number';
 

module/block/lang/zh-cn.php

@@ -40,7 +40,7 @@ $lang->block->contribute   = '我的贡献';
 
 $lang->block->leftToday      = '今天剩余工作总计';
 $lang->block->myTask         = '我的任务';
-$lang->block->myStory        = "我的{$lang->storyCommon}";
+$lang->block->myStory        = "我的{$lang->productSRCommon}";
 $lang->block->myBug          = '我的BUG';
 $lang->block->myProject      = '未关闭的' . $lang->projectCommon;
 $lang->block->myProduct      = '未关闭的' . $lang->productCommon;
@@ -81,7 +81,7 @@ $lang->block->hidden             = '隐藏';
 $lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <em>%s</em> %s <a href='%s' title='%s'>%s</a></span>";
 
 $lang->block->productName  = $lang->productCommon . '名称';
-$lang->block->totalStory   = '总' . $lang->storyCommon;
+$lang->block->totalStory   = '总' . $lang->productSRCommon;
 $lang->block->totalBug     = '总Bug';
 $lang->block->totalRelease = '发布次数';
 
@@ -175,7 +175,7 @@ $lang->block->default['product']['3']['grid']  = 8;
 $lang->block->default['product']['3']['params']['count'] = 15;
 $lang->block->default['product']['3']['params']['type']  = 'noclosed';
 
-$lang->block->default['product']['4']['title'] = "指派给我的{$lang->storyCommon}";
+$lang->block->default['product']['4']['title'] = "指派给我的{$lang->productSRCommon}";
 $lang->block->default['product']['4']['block'] = 'story';
 $lang->block->default['product']['4']['grid']  = 4;
 
@@ -306,7 +306,7 @@ $lang->block->availableBlocks->todo     = '我的待办';
 $lang->block->availableBlocks->task     = '我的任务';
 $lang->block->availableBlocks->bug      = '我的Bug';
 $lang->block->availableBlocks->case     = '我的用例';
-$lang->block->availableBlocks->story    = "我的{$lang->storyCommon}";
+$lang->block->availableBlocks->story    = "我的{$lang->productSRCommon}";
 $lang->block->availableBlocks->product  = $lang->productCommon . '列表';
 $lang->block->availableBlocks->project  = $lang->projectCommon . '列表';
 $lang->block->availableBlocks->plan     = "{$lang->planCommon}列表";
@@ -351,7 +351,7 @@ $lang->block->modules['product']->availableBlocks = new stdclass();
 $lang->block->modules['product']->availableBlocks->statistic = $lang->productCommon . '统计';
 $lang->block->modules['product']->availableBlocks->overview  = $lang->productCommon . '总览';
 $lang->block->modules['product']->availableBlocks->list      = $lang->productCommon . '列表';
-$lang->block->modules['product']->availableBlocks->story     = "{$lang->storyCommon}列表";
+$lang->block->modules['product']->availableBlocks->story     = "{$lang->productSRCommon}列表";
 $lang->block->modules['product']->availableBlocks->plan      = "{$lang->planCommon}列表";
 $lang->block->modules['product']->availableBlocks->release   = '发布列表';
 
@@ -521,7 +521,7 @@ $lang->block->gridOptions[4] = '右侧';
 
 $lang->block->flowchart   = array();
 $lang->block->flowchart['admin']   = array('管理员', '维护公司', '添加用户', '维护权限');
-$lang->block->flowchart['product'] = array($lang->productCommon . '经理', '创建' . $lang->productCommon, '维护模块', "维护{$lang->planCommon}", "维护{$lang->storyCommon}", '创建发布');
-$lang->block->flowchart['project'] = array($lang->projectCommon . '经理', '创建' . $lang->projectCommon, '维护团队', '关联' . $lang->productCommon, "关联{$lang->storyCommon}", '分解任务');
+$lang->block->flowchart['product'] = array($lang->productCommon . '经理', '创建' . $lang->productCommon, '维护模块', "维护{$lang->planCommon}", "维护{$lang->productSRCommon}", '创建发布');
+$lang->block->flowchart['project'] = array($lang->projectCommon . '经理', '创建' . $lang->projectCommon, '维护团队', '关联' . $lang->productCommon, "关联{$lang->productSRCommon}", '分解任务');
 $lang->block->flowchart['dev']     = array('研发人员', '领取任务和Bug', '更新状态', '完成任务和Bug');
 $lang->block->flowchart['tester']  = array('测试人员', '撰写用例', '执行用例', '提交Bug', '验证Bug', '关闭Bug');

module/block/lang/zh-tw.php

@@ -40,7 +40,7 @@ $lang->block->contribute   = '我的貢獻';
 
 $lang->block->leftToday      = '今天剩餘工作總計';
 $lang->block->myTask         = '我的任務';
-$lang->block->myStory        = "我的{$lang->storyCommon}";
+$lang->block->myStory        = "我的{$lang->productSRCommon}";
 $lang->block->myBug          = '我的BUG';
 $lang->block->myProject      = '未關閉的' . $lang->projectCommon;
 $lang->block->myProduct      = '未關閉的' . $lang->productCommon;
@@ -81,7 +81,7 @@ $lang->block->hidden             = '隱藏';
 $lang->block->dynamicInfo        = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <em>%s</em> %s <a href='%s' title='%s'>%s</a></span>";
 
 $lang->block->productName  = $lang->productCommon . '名稱';
-$lang->block->totalStory   = '總' . $lang->storyCommon;
+$lang->block->totalStory   = '總' . $lang->productSRCommon;
 $lang->block->totalBug     = '總Bug';
 $lang->block->totalRelease = '發佈次數';
 
@@ -175,7 +175,7 @@ $lang->block->default['product']['3']['grid']  = 8;
 $lang->block->default['product']['3']['params']['count'] = 15;
 $lang->block->default['product']['3']['params']['type']  = 'noclosed';
 
-$lang->block->default['product']['4']['title'] = "指派給我的{$lang->storyCommon}";
+$lang->block->default['product']['4']['title'] = "指派給我的{$lang->productSRCommon}";
 $lang->block->default['product']['4']['block'] = 'story';
 $lang->block->default['product']['4']['grid']  = 4;
 
@@ -306,7 +306,7 @@ $lang->block->availableBlocks->todo     = '我的待辦';
 $lang->block->availableBlocks->task     = '我的任務';
 $lang->block->availableBlocks->bug      = '我的Bug';
 $lang->block->availableBlocks->case     = '我的用例';
-$lang->block->availableBlocks->story    = "我的{$lang->storyCommon}";
+$lang->block->availableBlocks->story    = "我的{$lang->productSRCommon}";
 $lang->block->availableBlocks->product  = $lang->productCommon . '列表';
 $lang->block->availableBlocks->project  = $lang->projectCommon . '列表';
 $lang->block->availableBlocks->plan     = "{$lang->planCommon}列表";
@@ -351,7 +351,7 @@ $lang->block->modules['product']->availableBlocks = new stdclass();
 $lang->block->modules['product']->availableBlocks->statistic = $lang->productCommon . '統計';
 $lang->block->modules['product']->availableBlocks->overview  = $lang->productCommon . '總覽';
 $lang->block->modules['product']->availableBlocks->list      = $lang->productCommon . '列表';
-$lang->block->modules['product']->availableBlocks->story     = "{$lang->storyCommon}列表";
+$lang->block->modules['product']->availableBlocks->story     = "{$lang->productSRCommon}列表";
 $lang->block->modules['product']->availableBlocks->plan      = "{$lang->planCommon}列表";
 $lang->block->modules['product']->availableBlocks->release   = '發佈列表';
 
@@ -521,7 +521,7 @@ $lang->block->gridOptions[4] = '右側';
 
 $lang->block->flowchart   = array();
 $lang->block->flowchart['admin']   = array('管理員', '維護公司', '添加用戶', '維護權限');
-$lang->block->flowchart['product'] = array($lang->productCommon . '經理', '創建' . $lang->productCommon, '維護模組', "維護{$lang->planCommon}", "維護{$lang->storyCommon}", '創建發佈');
-$lang->block->flowchart['project'] = array($lang->projectCommon . '經理', '創建' . $lang->projectCommon, '維護團隊', '關聯' . $lang->productCommon, "關聯{$lang->storyCommon}", '分解任務');
+$lang->block->flowchart['product'] = array($lang->productCommon . '經理', '創建' . $lang->productCommon, '維護模組', "維護{$lang->planCommon}", "維護{$lang->productSRCommon}", '創建發佈');
+$lang->block->flowchart['project'] = array($lang->projectCommon . '經理', '創建' . $lang->projectCommon, '維護團隊', '關聯' . $lang->productCommon, "關聯{$lang->productSRCommon}", '分解任務');
 $lang->block->flowchart['dev']     = array('研發人員', '領取任務和Bug', '更新狀態', '完成任務和Bug');
 $lang->block->flowchart['tester']  = array('測試人員', '撰寫用例', '執行用例', '提交Bug', '驗證Bug', '關閉Bug');

module/bug/lang/zh-cn.php

@@ -18,8 +18,8 @@ $lang->bug->productplan      = '所属' . $lang->planCommon;
 $lang->bug->module           = '所属模块';
 $lang->bug->moduleAB         = '模块';
 $lang->bug->project          = '所属' . $lang->projectCommon;
-$lang->bug->story            = "相关{$lang->storyCommon}";
-$lang->bug->storyVersion     = "{$lang->storyCommon}版本";
+$lang->bug->story            = "相关{$lang->productSRCommon}";
+$lang->bug->storyVersion     = "{$lang->productSRCommon}版本";
 $lang->bug->color            = '标题颜色';
 $lang->bug->task             = '相关任务';
 $lang->bug->title            = 'Bug标题';
@@ -39,7 +39,7 @@ $lang->bug->activatedDate    = '激活日期';
 $lang->bug->confirmed        = '是否确认';
 $lang->bug->confirmedAB      = '确认';
 $lang->bug->toTask           = '转任务';
-$lang->bug->toStory          = "转{$lang->storyCommon}";
+$lang->bug->toStory          = "转{$lang->productSRCommon}";
 $lang->bug->mailto           = '抄送给';
 $lang->bug->openedBy         = '由谁创建';
 $lang->bug->openedByAB       = '创建者';
@@ -110,7 +110,7 @@ $lang->bug->exportAction       = '导出Bug';
 $lang->bug->delete             = '删除';
 $lang->bug->deleteAction       = '删除Bug';
 $lang->bug->deleted            = '已删除';
-$lang->bug->confirmStoryChange = "确认{$lang->storyCommon}变动";
+$lang->bug->confirmStoryChange = "确认{$lang->productSRCommon}变动";
 $lang->bug->copy               = '复制Bug';
 $lang->bug->search             = '搜索';
 
@@ -129,7 +129,7 @@ $lang->bug->postponedBugs      = '被延期';
 $lang->bug->overdueBugs        = '过期Bug';
 $lang->bug->allBugs            = '所有';
 $lang->bug->byQuery            = '搜索';
-$lang->bug->needConfirm        = "{$lang->storyCommon}变动";
+$lang->bug->needConfirm        = "{$lang->productSRCommon}变动";
 $lang->bug->allProduct         = '所有' . $lang->productCommon;
 $lang->bug->my                 = '我的';
 $lang->bug->yesterdayResolved  = '昨天解决Bug数';
@@ -159,7 +159,7 @@ $lang->bug->createBuild   = '创建';
 /* legend列表。*/
 $lang->bug->legendBasicInfo             = '基本信息';
 $lang->bug->legendAttatch               = '附件';
-$lang->bug->legendPrjStoryTask          = $lang->projectCommon . "/{$lang->storyCommon}/任务";
+$lang->bug->legendPrjStoryTask          = $lang->projectCommon . "/{$lang->productSRCommon}/任务";
 $lang->bug->lblTypeAndSeverity          = '类型/严重程度';
 $lang->bug->lblSystemBrowserAndHardware = '系统/浏览器';
 $lang->bug->legendSteps                 = '重现步骤';
@@ -173,7 +173,7 @@ $lang->bug->buttonConfirm = '确认';
 
 /* 交互提示。*/
 $lang->bug->summary              = "本页共 <strong>%s</strong> 个Bug，未解决 <strong>%s</strong>。";
-$lang->bug->confirmChangeProduct = "修改{$lang->productCommon}会导致相应的{$lang->projectCommon}、{$lang->storyCommon}和任务发生变化，确定吗？";
+$lang->bug->confirmChangeProduct = "修改{$lang->productCommon}会导致相应的{$lang->projectCommon}、{$lang->productSRCommon}和任务发生变化，确定吗？";
 $lang->bug->confirmDelete        = '您确认要删除该Bug吗？';
 $lang->bug->remindTask           = '该Bug已经转化为任务，是否更新任务(编号:%s)状态 ?';
 $lang->bug->skipClose            = 'Bug %s 不是已解决状态，不能关闭。';
@@ -270,7 +270,7 @@ $lang->bug->resolutionList['fixed']      = '已解决';
 $lang->bug->resolutionList['notrepro']   = '无法重现';
 $lang->bug->resolutionList['postponed']  = '延期处理';
 $lang->bug->resolutionList['willnotfix'] = "不予解决";
-$lang->bug->resolutionList['tostory']    = "转为{$lang->storyCommon}";
+$lang->bug->resolutionList['tostory']    = "转为{$lang->productSRCommon}";
 
 /* 统计报表。*/
 $lang->bug->report = new stdclass();
@@ -371,7 +371,7 @@ $lang->bug->report->bugHistories->graph->xAxisName          = '处理步骤';
 /* 操作记录。*/
 $lang->bug->action = new stdclass();
 $lang->bug->action->resolved            = array('main' => '$date, 由 <strong>$actor</strong> 解决，方案为 <strong>$extra</strong> $appendLink。', 'extra' => 'resolutionList');
-$lang->bug->action->tostory             = array('main' => '$date, 由 <strong>$actor</strong> 转为<strong> ' . $lang->storyCommon . '</strong>，编号为 <strong>$extra</strong>。');
+$lang->bug->action->tostory             = array('main' => '$date, 由 <strong>$actor</strong> 转为<strong> ' . $lang->productSRCommon . '</strong>，编号为 <strong>$extra</strong>。');
 $lang->bug->action->totask              = array('main' => '$date, 由 <strong>$actor</strong> 导入为<strong>任务</strong>，编号为 <strong>$extra</strong>。');
 $lang->bug->action->linked2plan         = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->planCommon . ' <strong>$extra</strong>。');
 $lang->bug->action->unlinkedfromplan    = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->planCommon . '  <strong>$extra</strong> 移除。');

module/bug/lang/zh-tw.php

@@ -18,8 +18,8 @@ $lang->bug->productplan      = '所屬計劃';
 $lang->bug->module           = '所屬模組';
 $lang->bug->moduleAB         = '模組';
 $lang->bug->project          = '所屬' . $lang->projectCommon;
-$lang->bug->story            = "相關{$lang->storyCommon}";
-$lang->bug->storyVersion     = "{$lang->storyCommon}版本";
+$lang->bug->story            = "相關{$lang->productSRCommon}";
+$lang->bug->storyVersion     = "{$lang->productSRCommon}版本";
 $lang->bug->color            = '標題顏色';
 $lang->bug->task             = '相關任務';
 $lang->bug->title            = 'Bug標題';
@@ -39,7 +39,7 @@ $lang->bug->activatedDate    = '激活日期';
 $lang->bug->confirmed        = '是否確認';
 $lang->bug->confirmedAB      = '確認';
 $lang->bug->toTask           = '轉任務';
-$lang->bug->toStory          = "轉{$lang->storyCommon}";
+$lang->bug->toStory          = "轉{$lang->productSRCommon}";
 $lang->bug->mailto           = '抄送給';
 $lang->bug->openedBy         = '由誰創建';
 $lang->bug->openedByAB       = '創建者';
@@ -110,7 +110,7 @@ $lang->bug->exportAction       = '導出Bug';
 $lang->bug->delete             = '刪除';
 $lang->bug->deleteAction       = '刪除Bug';
 $lang->bug->deleted            = '已刪除';
-$lang->bug->confirmStoryChange = "確認{$lang->storyCommon}變動";
+$lang->bug->confirmStoryChange = "確認{$lang->productSRCommon}變動";
 $lang->bug->copy               = '複製Bug';
 $lang->bug->search             = '搜索';
 
@@ -129,7 +129,7 @@ $lang->bug->postponedBugs      = '被延期';
 $lang->bug->overdueBugs        = '過期Bug';
 $lang->bug->allBugs            = '所有';
 $lang->bug->byQuery            = '搜索';
-$lang->bug->needConfirm        = "{$lang->storyCommon}變動";
+$lang->bug->needConfirm        = "{$lang->productSRCommon}變動";
 $lang->bug->allProduct         = '所有' . $lang->productCommon;
 $lang->bug->my                 = '我的';
 $lang->bug->yesterdayResolved  = '昨天解決Bug數';
@@ -159,7 +159,7 @@ $lang->bug->createBuild   = '創建';
 /* legend列表。*/
 $lang->bug->legendBasicInfo             = '基本信息';
 $lang->bug->legendAttatch               = '附件';
-$lang->bug->legendPrjStoryTask          = $lang->projectCommon . "/{$lang->storyCommon}/任務";
+$lang->bug->legendPrjStoryTask          = $lang->projectCommon . "/{$lang->productSRCommon}/任務";
 $lang->bug->lblTypeAndSeverity          = '類型/嚴重程度';
 $lang->bug->lblSystemBrowserAndHardware = '系統/瀏覽器';
 $lang->bug->legendSteps                 = '重現步驟';
@@ -173,7 +173,7 @@ $lang->bug->buttonConfirm = '確認';
 
 /* 交互提示。*/
 $lang->bug->summary              = "本頁共 <strong>%s</strong> 個Bug，未解決 <strong>%s</strong>。";
-$lang->bug->confirmChangeProduct = "修改{$lang->productCommon}會導致相應的{$lang->projectCommon}、{$lang->storyCommon}和任務發生變化，確定嗎？";
+$lang->bug->confirmChangeProduct = "修改{$lang->productCommon}會導致相應的{$lang->projectCommon}、{$lang->productSRCommon}和任務發生變化，確定嗎？";
 $lang->bug->confirmDelete        = '您確認要刪除該Bug嗎？';
 $lang->bug->remindTask           = '該Bug已經轉化為任務，是否更新任務(編號:%s)狀態 ?';
 $lang->bug->skipClose            = 'Bug %s 不是已解決狀態，不能關閉。';
@@ -270,7 +270,7 @@ $lang->bug->resolutionList['fixed']      = '已解決';
 $lang->bug->resolutionList['notrepro']   = '無法重現';
 $lang->bug->resolutionList['postponed']  = '延期處理';
 $lang->bug->resolutionList['willnotfix'] = "不予解決";
-$lang->bug->resolutionList['tostory']    = "轉為{$lang->storyCommon}";
+$lang->bug->resolutionList['tostory']    = "轉為{$lang->productSRCommon}";
 
 /* 統計報表。*/
 $lang->bug->report = new stdclass();
@@ -371,7 +371,7 @@ $lang->bug->report->bugHistories->graph->xAxisName          = '處理步驟';
 /* 操作記錄。*/
 $lang->bug->action = new stdclass();
 $lang->bug->action->resolved            = array('main' => '$date, 由 <strong>$actor</strong> 解決，方案為 <strong>$extra</strong> $appendLink。', 'extra' => 'resolutionList');
-$lang->bug->action->tostory             = array('main' => '$date, 由 <strong>$actor</strong> 轉為<strong> ' . $lang->storyCommon . '</strong>，編號為 <strong>$extra</strong>。');
+$lang->bug->action->tostory             = array('main' => '$date, 由 <strong>$actor</strong> 轉為<strong> ' . $lang->productSRCommon . '</strong>，編號為 <strong>$extra</strong>。');
 $lang->bug->action->totask              = array('main' => '$date, 由 <strong>$actor</strong> 導入為<strong>任務</strong>，編號為 <strong>$extra</strong>。');
 $lang->bug->action->linked2plan         = array('main' => '$date, 由 <strong>$actor</strong> 關聯到計劃 <strong>$extra</strong>。');
 $lang->bug->action->unlinkedfromplan    = array('main' => '$date, 由 <strong>$actor</strong> 從計劃 <strong>$extra</strong> 移除。');

module/build/lang/de.php

@@ -12,17 +12,17 @@
 $lang->build->common           = "Build";
 $lang->build->create           = "Build erstellen";
 $lang->build->edit             = "Bearbeiten";
-$lang->build->linkStory        = "{$lang->storyCommon} verknüpfen";
+$lang->build->linkStory        = "{$lang->productSRCommon} verknüpfen";
 $lang->build->linkBug          = "Bug verknüpfen";
 $lang->build->delete           = "Build löschen";
 $lang->build->deleted          = "Gelöscht";
 $lang->build->view             = "Build Details";
 $lang->build->batchUnlink      = 'Batch Unlink';
-$lang->build->batchUnlinkStory = "Batch {$lang->storyCommon} Unlink";
+$lang->build->batchUnlinkStory = "Batch {$lang->productSRCommon} Unlink";
 $lang->build->batchUnlinkBug   = 'Batch Bug Unlink';
 
 $lang->build->confirmDelete      = "Möchten Sie dieses Build löschen?";
-$lang->build->confirmUnlinkStory = "Möchten Sie diese {$lang->storyCommon} löschen?";
+$lang->build->confirmUnlinkStory = "Möchten Sie diese {$lang->productSRCommon} löschen?";
 $lang->build->confirmUnlinkBug   = "Möchten Sie die Verknüpfung zum Bug aufheben?";
 
 $lang->build->basicInfo = 'Basis Info';
@@ -40,18 +40,18 @@ $lang->build->desc          = 'Beschreibung';
 $lang->build->files         = 'Datei Upload';
 $lang->build->last          = 'Letztes Build';
 $lang->build->packageType   = 'Package Typ';
-$lang->build->unlinkStory   = "{$lang->storyCommon} Verknüpgung aufheben";
+$lang->build->unlinkStory   = "{$lang->productSRCommon} Verknüpgung aufheben";
 $lang->build->unlinkBug     = 'Bug Verknüpgung aufheben';
-$lang->build->stories       = "Abgeschlossene {$lang->storyCommon}";
+$lang->build->stories       = "Abgeschlossene {$lang->productSRCommon}";
 $lang->build->bugs          = 'Gelöster Bug';
 $lang->build->generatedBugs = 'Left Bug';
 $lang->build->noProduct     = " <span style='color:red'>Dieses {$lang->projectCommon} ist nicht mit einem {$lang->productCommon} verknüpft, daher kann das Build nicht erstellt werden. Bitte erst <a href='%s'> {$lang->productCommon} verknüpfen.</a></span>";
 $lang->build->noBuild       = 'Keine Builds. ';
 
 $lang->build->notice = new stdclass();
-$lang->build->notice->changeProduct = "The {$lang->storyCommon} or Bug has been associated, and its product cannot be modified";
+$lang->build->notice->changeProduct = "The {$lang->productSRCommon} or Bug has been associated, and its product cannot be modified";
 
-$lang->build->finishStories = "  %s {$lang->storyCommon} sind abgeschlossen.";
+$lang->build->finishStories = "  %s {$lang->productSRCommon} sind abgeschlossen.";
 $lang->build->resolvedBugs  = '  %s Bugs sind gelöst.';
 $lang->build->createdBugs   = '  %s Bugs wurden erstellt.';
 

module/build/lang/en.php

@@ -12,17 +12,17 @@
 $lang->build->common           = "Build";
 $lang->build->create           = "Create Build";
 $lang->build->edit             = "Edit Build";
-$lang->build->linkStory        = "Link {$lang->storyCommon}";
+$lang->build->linkStory        = "Link {$lang->productSRCommon}";
 $lang->build->linkBug          = "Link Bug";
 $lang->build->delete           = "Delete Build";
 $lang->build->deleted          = "Deleted";
 $lang->build->view             = "Build Detail";
 $lang->build->batchUnlink      = 'Batch Unlink';
-$lang->build->batchUnlinkStory = "Batch Unlink {$lang->storyCommon}";
+$lang->build->batchUnlinkStory = "Batch Unlink {$lang->productSRCommon}";
 $lang->build->batchUnlinkBug   = 'Batch Unlink Bugs';
 
 $lang->build->confirmDelete      = "Do you want to delete this build?";
-$lang->build->confirmUnlinkStory = "Do you want to unlink this {$lang->storyCommon}?";
+$lang->build->confirmUnlinkStory = "Do you want to unlink this {$lang->productSRCommon}?";
 $lang->build->confirmUnlinkBug   = "Do you want to unlink this Bug?";
 
 $lang->build->basicInfo = 'Basic Info';
@@ -40,18 +40,18 @@ $lang->build->desc          = 'Description';
 $lang->build->files         = 'Files';
 $lang->build->last          = 'Last Build';
 $lang->build->packageType   = 'Package Type';
-$lang->build->unlinkStory   = "Unlink {$lang->storyCommon}";
+$lang->build->unlinkStory   = "Unlink {$lang->productSRCommon}";
 $lang->build->unlinkBug     = 'Unlink Bug';
-$lang->build->stories       = "Finished {$lang->storyCommon}";
+$lang->build->stories       = "Finished {$lang->productSRCommon}";
 $lang->build->bugs          = 'Resolved Bugs';
 $lang->build->generatedBugs = 'Reported Bugs';
 $lang->build->noProduct     = " <span style='color:red'>This {$lang->projectCommon} is not linked to {$lang->productCommon}, so the Build cannot be created. Please first <a href='%s'> link {$lang->productCommon}</a></span>";
 $lang->build->noBuild       = 'No builds yet.';
 
 $lang->build->notice = new stdclass();
-$lang->build->notice->changeProduct = "The {$lang->storyCommon} or Bug has been associated, and its product cannot be modified";
+$lang->build->notice->changeProduct = "The {$lang->productSRCommon} or Bug has been associated, and its product cannot be modified";
 
-$lang->build->finishStories = "  Finished {$lang->storyCommon} %s";
+$lang->build->finishStories = "  Finished {$lang->productSRCommon} %s";
 $lang->build->resolvedBugs  = '  Resolved Bug %s';
 $lang->build->createdBugs   = '  Reported Bug %s';
 

module/build/lang/fr.php

@@ -12,17 +12,17 @@
 $lang->build->common           = "Build";
 $lang->build->create           = "Créer Build";
 $lang->build->edit             = "Editer Build";
-$lang->build->linkStory        = "Intégrer {$lang->storyCommon}";
+$lang->build->linkStory        = "Intégrer {$lang->productSRCommon}";
 $lang->build->linkBug          = "Intégrer Bug";
 $lang->build->delete           = "Supprimer Build";
 $lang->build->deleted          = "Supprimé";
 $lang->build->view             = "Détail Build";
 $lang->build->batchUnlink      = 'Retirer par Lot';
-$lang->build->batchUnlinkStory = "Retirer {$lang->storyCommon} par Lot";
+$lang->build->batchUnlinkStory = "Retirer {$lang->productSRCommon} par Lot";
 $lang->build->batchUnlinkBug   = 'Retirer Bugs par Lot';
 
 $lang->build->confirmDelete      = "Voulez-vous supprimer ce build ?";
-$lang->build->confirmUnlinkStory = "Voulez-vous retirer cette {$lang->storyCommon} du Build ?";
+$lang->build->confirmUnlinkStory = "Voulez-vous retirer cette {$lang->productSRCommon} du Build ?";
 $lang->build->confirmUnlinkBug   = "Voulez-vous retirer ce Bug du Build ?";
 
 $lang->build->basicInfo = 'Infos de Base';
@@ -40,7 +40,7 @@ $lang->build->desc          = 'Description';
 $lang->build->files         = 'Fichiers';
 $lang->build->last          = 'Dernier Build';
 $lang->build->packageType   = 'Type de Package';
-$lang->build->unlinkStory   = "Retirer {$lang->storyCommon}";
+$lang->build->unlinkStory   = "Retirer {$lang->productSRCommon}";
 $lang->build->unlinkBug     = 'Retirer Bug';
 $lang->build->stories       = 'Stories terminées';
 $lang->build->bugs          = 'Bugs Résolus';
@@ -49,9 +49,9 @@ $lang->build->noProduct     = " <span style='color:red'>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';
 

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     = " <span style='color:red'>{$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 <a href='%s'> {$lang->productCommon} trước</a></span>";
 $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';
 

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     = " <span style='color:red'>该{$lang->projectCommon}没有关联{$lang->productCommon}，无法创建版本，请先<a href='%s'>关联{$lang->productCommon}</a></span>";
 $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';
 

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     = " <span style='color:red'>該{$lang->projectCommon}沒有關聯{$lang->productCommon}，無法創建版本，請先<a href='%s'>關聯{$lang->productCommon}</a></span>";
 $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';
 

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&param=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&param=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&param=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&param=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');

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&param=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');

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 . '计划';

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 . '計劃';

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));
         }
 

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               = '我们已经根据您的选择为您设置了<b> %s-%s </b>模式，使用<b>%s</b> + <b> %s</b>。';
 $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                   = '自定义需求名称不能为空！';
 

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               = '我們已經根據您的選擇為您設置了<b> %s-%s </b>模式，使用<b>%s</b> + <b> %s</b>。';
 $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版本起增加了產品主頁視圖，是否預設進入產品主頁？";

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';

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';

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';

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';

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     = '由谁创建';

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']            = '积分';

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']            = '積分';

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')

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" => "<p>增强测试任务管理</p><p>优化计划、发布、版本关联{$lang->storyCommon}和bug的交互</p><p>文档库可以自定义是否显示子分类里的文档</p><p>修复bug，完善细节</p>");
+$lang->misc->feature->all["11.4.stable"][] = array("title"=>"完善细节，修复Bug", "desc" => "<p>增强测试任务管理</p><p>优化计划、发布、版本关联{$lang->productSRCommon}和bug的交互</p><p>文档库可以自定义是否显示子分类里的文档</p><p>修复bug，完善细节</p>");
 
 $lang->misc->feature->all['11.3.stable'][] = array('title'=>'完善细节，修复Bug', 'desc' => '<p>计划添加子计划功能</p><p>优化chosen交互</p><p>添加时区设置</p><p>优化文档库和文档</p>');
 
@@ -231,14 +231,14 @@ $lang->misc->feature->all['8.3.stable'][] = array('title'=>'调整文档功能',
 $lang->misc->feature->all['8.2.stable'][] = array('title'=>'首页自定义', 'desc' => '<p>我的地盘由我做主。现在开始，你可以向首页添加多种多样的内容区块，而且还可以决定如何排列和显示他们。</p><p>我的地盘、产品、项目、测试模块下均支持首页自定义功能。</p>');
 $lang->misc->feature->all['8.2.stable'][] = array('title'=>'导航定制', 'desc' => '<p>导航上显示的项目现在完全由你来决定，不仅仅可以决定在导航上展示哪些内容，还可以决定展示的顺序。</p><p>将鼠标悬浮在导航上稍后会在右侧显示定制按钮，点击打开定制对话框，通过点击切换是否显示，拖放操作来更改显示顺序。</p>');
 $lang->misc->feature->all['8.2.stable'][] = array('title'=>'批量添加、编辑自定义', 'desc' => '<p>可以在批量添加和批量编辑页面自定义操作的字段。</p>');
-$lang->misc->feature->all['8.2.stable'][] = array('title'=>"添加{$lang->storyCommon}、任务、Bug、用例自定义", 'desc' => "<p>可以在添加{$lang->storyCommon}、任务、Bug、用例页面，自定义部分字段是否显示。</p>");
-$lang->misc->feature->all['8.2.stable'][] = array('title'=>'导出自定义', 'desc' => "<p>在导出{$lang->storyCommon}、任务、Bug、用例的时候，用户可以自定义导出的字段，也可以保存模板方便每次导出。</p>");
-$lang->misc->feature->all['8.2.stable'][] = array('title'=>"{$lang->storyCommon}、任务、Bug、用例组合检索功能", 'desc' => "<p>在{$lang->storyCommon}、任务、Bug、用例列表页面，可以实现模块和标签的组合检索。</p>");
+$lang->misc->feature->all['8.2.stable'][] = array('title'=>"添加{$lang->productSRCommon}、任务、Bug、用例自定义", 'desc' => "<p>可以在添加{$lang->productSRCommon}、任务、Bug、用例页面，自定义部分字段是否显示。</p>");
+$lang->misc->feature->all['8.2.stable'][] = array('title'=>'导出自定义', 'desc' => "<p>在导出{$lang->productSRCommon}、任务、Bug、用例的时候，用户可以自定义导出的字段，也可以保存模板方便每次导出。</p>");
+$lang->misc->feature->all['8.2.stable'][] = array('title'=>"{$lang->productSRCommon}、任务、Bug、用例组合检索功能", 'desc' => "<p>在{$lang->productSRCommon}、任务、Bug、用例列表页面，可以实现模块和标签的组合检索。</p>");
 $lang->misc->feature->all['8.2.stable'][] = array('title'=>'增加新手教程', 'desc' => '<p>增加新手教程，方便新用户了解禅道使用。</p>');
 
-$lang->misc->feature->all['7.4.beta'][] = array('title'=>'产品实现分支功能', 'desc' => "<p>产品增加分支/平台类型，相应的{$lang->storyCommon}、计划、Bug、用例、模块等都增加分支。</p>");
+$lang->misc->feature->all['7.4.beta'][] = array('title'=>'产品实现分支功能', 'desc' => "<p>产品增加分支/平台类型，相应的{$lang->productSRCommon}、计划、Bug、用例、模块等都增加分支。</p>");
 $lang->misc->feature->all['7.4.beta'][] = array('title'=>'调整发布模块', 'desc' => '<p>发布增加停止维护操作，当发布停止维护时，创建Bug将不显示这个发布。</p><p>发布中遗留的bug改为手工关联。</p>');
-$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' => '<p>加强对管理员弱口令的检查。</p><p>写插件，上传插件的时候需要创建ok文件。</p><p>敏感操作增加管理员口令的检查</p><p>对输入内容做striptags, specialchars处理。</p>');
 $lang->misc->feature->all['7.2.stable'][] = array('title'=>'完善细节', 'desc' => '');

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" => "<p>增強測試任務管理</p><p>優化計劃、發佈、版本關聯{$lang->storyCommon}和bug的交互</p><p>文檔庫可以自定義是否顯示子分類裡的文檔</p><p>修復bug，完善細節</p>");
+$lang->misc->feature->all["11.4.stable"][] = array("title"=>"完善細節，修復Bug", "desc" => "<p>增強測試任務管理</p><p>優化計劃、發佈、版本關聯{$lang->productSRCommon}和bug的交互</p><p>文檔庫可以自定義是否顯示子分類裡的文檔</p><p>修復bug，完善細節</p>");
 
 $lang->misc->feature->all['11.3.stable'][] = array('title'=>'完善細節，修復Bug', 'desc' => '<p>計劃添加子計劃功能</p><p>優化chosen交互</p><p>添加時區設置</p><p>優化文檔庫和文檔</p>');
 
@@ -228,14 +228,14 @@ $lang->misc->feature->all['8.3.stable'][] = array('title'=>'調整文檔功能',
 $lang->misc->feature->all['8.2.stable'][] = array('title'=>'首頁自定義', 'desc' => '<p>我的地盤由我做主。現在開始，你可以向首頁添加多種多樣的內容區塊，而且還可以決定如何排列和顯示他們。</p><p>我的地盤、產品、項目、測試模組下均支持首頁自定義功能。</p>');
 $lang->misc->feature->all['8.2.stable'][] = array('title'=>'導航定製', 'desc' => '<p>導航上顯示的項目現在完全由你來決定，不僅僅可以決定在導航上展示哪些內容，還可以決定展示的順序。</p><p>將滑鼠懸浮在導航上稍後會在右側顯示定製按鈕，點擊打開定製對話框，通過點擊切換是否顯示，拖放操作來更改顯示順序。</p>');
 $lang->misc->feature->all['8.2.stable'][] = array('title'=>'批量添加、編輯自定義', 'desc' => '<p>可以在批量添加和批量編輯頁面自定義操作的欄位。</p>');
-$lang->misc->feature->all['8.2.stable'][] = array('title'=>"添加{$lang->storyCommon}、任務、Bug、用例自定義", 'desc' => "<p>可以在添加{$lang->storyCommon}、任務、Bug、用例頁面，自定義部分欄位是否顯示。</p>");
-$lang->misc->feature->all['8.2.stable'][] = array('title'=>'導出自定義', 'desc' => "<p>在導出{$lang->storyCommon}、任務、Bug、用例的時候，用戶可以自定義導出的欄位，也可以保存模板方便每次導出。</p>");
-$lang->misc->feature->all['8.2.stable'][] = array('title'=>"{$lang->storyCommon}、任務、Bug、用例組合檢索功能", 'desc' => "<p>在{$lang->storyCommon}、任務、Bug、用例列表頁面，可以實現模組和標籤的組合檢索。</p>");
+$lang->misc->feature->all['8.2.stable'][] = array('title'=>"添加{$lang->productSRCommon}、任務、Bug、用例自定義", 'desc' => "<p>可以在添加{$lang->productSRCommon}、任務、Bug、用例頁面，自定義部分欄位是否顯示。</p>");
+$lang->misc->feature->all['8.2.stable'][] = array('title'=>'導出自定義', 'desc' => "<p>在導出{$lang->productSRCommon}、任務、Bug、用例的時候，用戶可以自定義導出的欄位，也可以保存模板方便每次導出。</p>");
+$lang->misc->feature->all['8.2.stable'][] = array('title'=>"{$lang->productSRCommon}、任務、Bug、用例組合檢索功能", 'desc' => "<p>在{$lang->productSRCommon}、任務、Bug、用例列表頁面，可以實現模組和標籤的組合檢索。</p>");
 $lang->misc->feature->all['8.2.stable'][] = array('title'=>'增加新手教程', 'desc' => '<p>增加新手教程，方便新用戶瞭解禪道使用。</p>');
 
-$lang->misc->feature->all['7.4.beta'][] = array('title'=>'產品實現分支功能', 'desc' => "<p>產品增加分支/平台類型，相應的{$lang->storyCommon}、計劃、Bug、用例、模組等都增加分支。</p>");
+$lang->misc->feature->all['7.4.beta'][] = array('title'=>'產品實現分支功能', 'desc' => "<p>產品增加分支/平台類型，相應的{$lang->productSRCommon}、計劃、Bug、用例、模組等都增加分支。</p>");
 $lang->misc->feature->all['7.4.beta'][] = array('title'=>'調整發佈模組', 'desc' => '<p>發佈增加停止維護操作，當發佈停止維護時，創建Bug將不顯示這個發佈。</p><p>發佈中遺留的bug改為手工關聯。</p>');
-$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' => '<p>加強對管理員弱口令的檢查。</p><p>寫插件，上傳插件的時候需要創建ok檔案。</p><p>敏感操作增加管理員口令的檢查</p><p>對輸入內容做striptags, specialchars處理。</p>');
 $lang->misc->feature->all['7.2.stable'][] = array('title'=>'完善細節', 'desc' => '');

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      = '我的执行';

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      = '我的執行';

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;
         }
 

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';

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';

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. */
@@ -1172,11 +1173,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 . "%");

module/product/view/browse.html.php

@@ -441,14 +441,7 @@ $('#branch' + branchID).closest('li').addClass('active');
 $(function()
 {
     // Update table summary text
-    <?php
-    $storyCommon = $lang->storyCommon;
-    if($config->URAndSR)
-    {
-        if($storyType == 'requirement') $storyCommon = $lang->URCommon;
-        if($storyType == 'story') $storyCommon = $lang->SRCommon;
-    }
-    ?>
+    <?php $storyCommon = $lang->productSRCommon;?>
     var checkedSummary = '<?php echo str_replace('%storyCommon%', $storyCommon, $lang->product->checkedSummary)?>';
     $('#productStoryForm').table(
     {

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;

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;

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';

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            = '请选择一个项目来复制';

module/program/model.php

@@ -838,15 +838,16 @@ class programModel extends model
             ->groupBy('PRJ')
             ->fetchAll('PRJ');
 
+        $this->app->loadClass('pager', $static = true);
         foreach($projects as $projectID => $project)
         {
-            $orderBy = $project->model == 'waterfall' ? 'id_asc' : 'id_desc';
-            $project->executions = $this->project->getExecutionStats($projectID, $status, 0, 0, $itemCounts, $orderBy);
+            $orderBy = $project->model == 'waterfall' ? 'path_asc,id_asc' : 'id_desc';
+            $pager   = $project->model == 'waterfall' ? null : new pager(0, 1, 1);
+            $project->executions = $this->project->getExecutionStats($projectID, 'undone', 0, 0, 30, $orderBy, $pager);
             $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;
     }
 

module/programplan/model.php

@@ -804,14 +804,16 @@ class programplanModel extends model
                 break;
             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))
+                $class = !empty($plan->children) ? 'disabled' : '';
+                common::printIcon('task', 'create', "projectID={$plan->id}", $plan, 'list', '', '', $class);
+
+                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 . '");', '<i class="icon-programplan-create icon-treemap"></i>', '', 'class="btn ' . $disabled . '"');
                 }
 

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 = 'all', $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();
     }

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';

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';

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é';

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      = "<div>总任务 <strong>%s : </strong><spa
 $lang->project->wbs                 = "分解任务";
 $lang->project->batchWBS            = "批量分解";
 $lang->project->howToUpdateBurn     = "<a href='https://api.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank' title='如何更新燃尽图？' class='btn btn-link'>帮助 <i class='icon icon-help'></i></a>";
-$lang->project->whyNoStories        = "看起来没有{$lang->storyCommon}可以关联。请检查下{$lang->projectCommon}关联的{$lang->productCommon}中有没有{$lang->storyCommon}，而且要确保它们已经审核通过。";
-$lang->project->productStories      = "{$lang->projectCommon}关联的{$lang->storyCommon}是{$lang->productCommon}{$lang->storyCommon}的子集，并且只有评审通过的{$lang->storyCommon}才能关联。请<a href='%s'>关联{$lang->storyCommon}</a>。";
-$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}才能关联。请<a href='%s'>关联{$lang->productSRCommon}</a>。";
+$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}";

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      = "<div>總任務 <strong>%s : </strong><spa
 $lang->project->wbs                 = "分解任務";
 $lang->project->batchWBS            = "批量分解";
 $lang->project->howToUpdateBurn     = "<a href='https://api.zentao.net/goto.php?item=burndown&lang=zh-tw' target='_blank' title='如何更新燃盡圖？' class='btn btn-link'>幫助 <i class='icon icon-help'></i></a>";
-$lang->project->whyNoStories        = "看起來沒有{$lang->storyCommon}可以關聯。請檢查下{$lang->projectCommon}關聯的{$lang->productCommon}中有沒有{$lang->storyCommon}，而且要確保它們已經審核通過。";
-$lang->project->productStories      = "{$lang->projectCommon}關聯的{$lang->storyCommon}是{$lang->productCommon}{$lang->storyCommon}的子集，並且只有評審通過的{$lang->storyCommon}才能關聯。請<a href='%s'>關聯{$lang->storyCommon}</a>。";
-$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}才能關聯。請<a href='%s'>關聯{$lang->productSRCommon}</a>。";
+$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}";

module/project/model.php

@@ -332,18 +332,11 @@ class projectModel extends model
             ->remove('products, workDays, delta, branch, uid, plans')
             ->get();
 
-        /* Check the workload format and total. */
-        if(!empty($sprint->percent))
+        /* Check the workload format. */
+        if(!empty($sprint->percent) and !preg_match("/^[0-9]+(.[0-9]{1,3})?$/", $sprint->percent))
         {
-            if(!preg_match("/^[0-9]+(.[0-9]{1,3})?$/", $sprint->percent))
-            {
-                dao::$errors['percent'] = $this->lang->programplan->error->percentNumber;
-                return false;
-            }
-
-            $percentTotal  = $this->dao->select('SUM(percent) as percent')->from(TABLE_PROJECT)->where('project')->eq($project->id)->andWhere('type')->eq('stage')->andWhere('deleted')->eq('0')->fetch('percent');
-            $percentTotal += $sprint->percent;
-            if($percentTotal > 100) return dao::$errors['percent'] = $this->lang->programplan->error->percentOver;
+            dao::$errors['percent'] = $this->lang->programplan->error->percentNumber;
+            return false;
         }
 
         /* Set planDuration and realDuration. */
@@ -452,17 +445,11 @@ class projectModel extends model
 
         $project = $this->loadModel('file')->processImgURL($project, $this->config->project->editor->edit['id'], $this->post->uid);
 
-        /* Check the workload format and total. */
-        if(!empty($project->percent))
+        /* Check the workload format. */
+        if(!empty($project->percent) and !preg_match("/^[0-9]+(.[0-9]{1,3})?$/", $project->percent))
         {
-            if(!preg_match("/^[0-9]+(.[0-9]{1,3})?$/", $project->percent))
-            {
-                dao::$errors['percent'] = $this->lang->programplan->error->percentNumber;
-                return false;
-            }
-
-            $percentTotal = $this->dao->select('SUM(percent) as percent')->from(TABLE_PROJECT)->where('project')->eq($this->session->PRJ)->andWhere('type')->eq('stage')->andWhere('deleted')->eq('0')->fetch('percent');
-            if($percentTotal > 100) return dao::$errors['percent'] = $this->lang->programplan->error->percentOver;
+            dao::$errors['percent'] = $this->lang->programplan->error->percentNumber;
+            return false;
         }
 
         /* Set planDuration and realDuration. */
@@ -962,7 +949,7 @@ class projectModel extends model
             ->beginIF($status == 'undone')->andWhere('status')->notIN('done,closed')->fi()
             ->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi()
             ->andWhere('deleted')->eq('0')
-            ->orderBy('path_asc')
+            ->orderBy('path_asc,id_asc')
             ->beginIF($limit)->limit($limit)->fi()
             ->fetchAll('id');
 
@@ -999,15 +986,16 @@ 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))
         {
             $executions = $this->dao->select('*')->from(TABLE_EXECUTION)
                 ->where('project')->eq($projectID)
-                ->andWhere('type')->eq('stage')
+                ->beginIF($status == 'undone')->andWhere('status')->notIN('done,closed')->fi()
+                ->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->eq($status)->fi()
                 ->andWhere('deleted')->eq('0')
-                ->orderBy('path_desc,id_asc')
+                ->orderBy($orderBy)
                 ->page($pager)
                 ->fetchAll('id');
         }
@@ -1017,15 +1005,16 @@ class projectModel extends model
                 ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project=t2.id')
                 ->where('t1.product')->eq($productID)
                 ->andWhere('t2.project')->eq($projectID)
-                ->andWhere('t2.type')->eq('stage')
+                ->beginIF($status == 'undone')->andWhere('t2.status')->notIN('done,closed')->fi()
+                ->beginIF($status != 'all' and $status != 'undone')->andWhere('t2.status')->eq($status)->fi()
                 ->andWhere('t2.deleted')->eq('0')
-                ->orderBy('t2.parent_desc,t2.id_asc')
+                ->orderBy($orderBy)
                 ->page($pager)
                 ->fetchAll('id');
         }
 
-        $hours       = array();
-        $emptyHour   = array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0);
+        $hours     = array();
+        $emptyHour = array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0);
 
         /* Get all tasks and compute totalEstimate, totalConsumed, totalLeft, progress according to them. */
         $tasks = $this->dao->select('id, project, estimate, consumed, `left`, status, closedReason')
@@ -1496,7 +1485,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();

module/project/view/all.html.php

@@ -69,54 +69,54 @@
         </tr>
       </thead>
       <tbody class='sortable' id='projectTableList'>
-        <?php foreach($projectStats as $project):?>
-        <tr data-id='<?php echo $project->id ?>' data-order='<?php echo $project->order ?>'>
+        <?php foreach($executionStats as $execution):?>
+        <tr data-id='<?php echo $execution->id ?>' data-order='<?php echo $execution->order ?>'>
           <td class='c-id'>
             <?php if($canBatchEdit):?>
             <div class="checkbox-primary">
-              <input type='checkbox' name='projectIDList[<?php echo $project->id;?>]' value='<?php echo $project->id;?>' />
+              <input type='checkbox' name='projectIDList[<?php echo $execution->id;?>]' value='<?php echo $execution->id;?>' />
               <label></label>
             </div>
             <?php endif;?>
-            <?php printf('%03d', $project->id);?>
+            <?php printf('%03d', $execution->id);?>
           </td>
-          <td class='text-left <?php if(!empty($project->children)) echo 'has-child';?>' title='<?php echo $project->name?>'>
+          <td class='text-left <?php if(!empty($execution->children)) echo 'has-child';?>' title='<?php echo $execution->name?>'>
             <?php
-            if(isset($project->delay)) echo "<span class='label label-danger label-badge'>{$lang->project->delayed}</span> ";
-            echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name);
+            if(isset($execution->delay)) echo "<span class='label label-danger label-badge'>{$lang->project->delayed}</span> ";
+            echo html::a($this->createLink('project', 'view', 'project=' . $execution->id), $execution->name);
             ?>
-            <?php if(!empty($project->children)):?>
-              <a class="plan-toggle" data-id="<?php echo $project->id;?>"><i class="icon icon-angle-double-right"></i></a>
+            <?php if(!empty($execution->children)):?>
+              <a class="plan-toggle" data-id="<?php echo $execution->id;?>"><i class="icon icon-angle-double-right"></i></a>
             <?php endif;?>
           </td>
-          <td class='text-left' title="<?php echo $project->code;?>"><?php echo $project->code;?></td>
-          <td><?php echo zget($users, $project->PM);?></td>
-          <td><?php echo $project->end;?></td>
-          <?php $projectStatus = $this->processStatus('project', $project);?>
+          <td class='text-left' title="<?php echo $execution->code;?>"><?php echo $execution->code;?></td>
+          <td><?php echo zget($users, $execution->PM);?></td>
+          <td><?php echo $execution->end;?></td>
+          <?php $projectStatus = $this->processStatus('project', $execution);?>
           <td class='c-status' title='<?php echo $projectStatus;?>'>
-            <span class="status-project status-<?php echo $project->status?>"><?php echo $projectStatus;?></span>
+            <span class="status-project status-<?php echo $execution->status?>"><?php echo $projectStatus;?></span>
           </td>
-          <td><?php echo $project->hours->totalEstimate;?></td>
-          <td><?php echo $project->hours->totalConsumed;?></td>
-          <td><?php echo $project->hours->totalLeft;?></td>
+          <td><?php echo $execution->hours->totalEstimate;?></td>
+          <td><?php echo $execution->hours->totalConsumed;?></td>
+          <td><?php echo $execution->hours->totalLeft;?></td>
           <td class="c-progress">
             <div class="progress progress-text-left">
-              <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $project->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->hours->progress;?>%">
-              <span class="progress-text"><?php echo $project->hours->progress;?>%</span>
+              <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $execution->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $execution->hours->progress;?>%">
+              <span class="progress-text"><?php echo $execution->hours->progress;?>%</span>
               </div>
             </div>
           </td>
-          <td id='spark-<?php echo $project->id?>' class='sparkline text-left no-padding' values='<?php echo join(',', $project->burns);?>'></td>
+          <td id='spark-<?php echo $execution->id?>' class='sparkline text-left no-padding' values='<?php echo join(',', $execution->burns);?>'></td>
           <?php if($canOrder):?>
           <td class='sort-handler'><i class="icon icon-move"></i></td>
           <?php endif;?>
         </tr>
-        <?php if(!empty($project->children)):?>
+        <?php if(!empty($execution->children)):?>
          <?php $i = 0;?>
-           <?php foreach($project->children as $key => $child):?>
+           <?php foreach($execution->children as $key => $child):?>
            <?php $class  = $i == 0 ? ' table-child-top' : '';?>
-           <?php $class .= ($i + 1 == count($project->children)) ? ' table-child-bottom' : '';?>
-           <tr class='table-children<?php echo $class;?> parent-<?php echo $project->id;?>' data-id='<?php echo $child->id?>'>
+           <?php $class .= ($i + 1 == count($execution->children)) ? ' table-child-bottom' : '';?>
+           <tr class='table-children<?php echo $class;?> parent-<?php echo $execution->id;?>' data-id='<?php echo $child->id?>'>
              <td class='c-id'>
                <?php if($canBatchEdit):?>
                <div class="checkbox-primary">
@@ -161,7 +161,7 @@
         <?php endforeach;?>
       </tbody>
     </table>
-    <?php if($projectStats):?>
+    <?php if($executionStats):?>
     <div class='table-footer'>
       <?php if($canBatchEdit):?>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>

module/project/view/story.html.php

@@ -356,10 +356,7 @@
 $(function()
 {
     // Update table summary text
-    <?php
-    $storyCommon = $lang->storyCommon;
-    if(!empty($config->URAndSR)) $storyCommon = $lang->SRCommon;
-    ?>
+    <?php $storyCommon = $lang->projectSRCommon;?>
     var checkedSummary = '<?php echo str_replace('%storyCommon%', $storyCommon, $lang->product->checkedSummary)?>';
     $('#projectStoryForm').table(
     {

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';
 

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';
 

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 = " ";

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 = " ";

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 = "个";

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 = "個";

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##分";

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##分";

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     = '显示在菜单栏';

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     = '顯示在菜單欄';

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);

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();

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();

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();

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();

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, 由 <strong>$actor</strong> 记录评审结果，结果为 <strong>$extra</strong>。', 'extra' => 'reviewResultList');
@@ -283,21 +283,21 @@ $lang->story->action->linked2build        = array('main' => '$date, 由 <strong>
 $lang->story->action->unlinkedfrombuild   = array('main' => '$date, 由 <strong>$actor</strong> 从版本 <strong>$extra</strong> 移除。');
 $lang->story->action->linked2release      = array('main' => '$date, 由 <strong>$actor</strong> 关联到发布 <strong>$extra</strong>。');
 $lang->story->action->unlinkedfromrelease = array('main' => '$date, 由 <strong>$actor</strong> 从发布 <strong>$extra</strong> 移除。');
-$lang->story->action->linkrelatedstory    = array('main' => "\$date, 由 <strong>\$actor</strong> 关联相关{$lang->storyCommon} <strong>\$extra</strong>。");
-$lang->story->action->subdividestory      = array('main' => "\$date, 由 <strong>\$actor</strong> 细分为{$lang->storyCommon}   <strong>\$extra</strong>。");
-$lang->story->action->unlinkrelatedstory  = array('main' => "\$date, 由 <strong>\$actor</strong> 移除相关{$lang->storyCommon} <strong>\$extra</strong>。");
-$lang->story->action->unlinkchildstory    = array('main' => "\$date, 由 <strong>\$actor</strong> 移除细分{$lang->storyCommon} <strong>\$extra</strong>。");
+$lang->story->action->linkrelatedstory    = array('main' => "\$date, 由 <strong>\$actor</strong> 关联相关{$lang->productSRCommon} <strong>\$extra</strong>。");
+$lang->story->action->subdividestory      = array('main' => "\$date, 由 <strong>\$actor</strong> 细分为{$lang->productSRCommon}   <strong>\$extra</strong>。");
+$lang->story->action->unlinkrelatedstory  = array('main' => "\$date, 由 <strong>\$actor</strong> 移除相关{$lang->productSRCommon} <strong>\$extra</strong>。");
+$lang->story->action->unlinkchildstory    = array('main' => "\$date, 由 <strong>\$actor</strong> 移除细分{$lang->productSRCommon} <strong>\$extra</strong>。");
 
 /* 统计报表。*/
 $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'] = '指派给';

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, 由 <strong>$actor</strong> 記錄評審結果，結果為 <strong>$extra</strong>。', 'extra' => 'reviewResultList');
@@ -254,21 +254,21 @@ $lang->story->action->linked2build        = array('main' => '$date, 由 <strong>
 $lang->story->action->unlinkedfrombuild   = array('main' => '$date, 由 <strong>$actor</strong> 從版本 <strong>$extra</strong> 移除。');
 $lang->story->action->linked2release      = array('main' => '$date, 由 <strong>$actor</strong> 關聯到發佈 <strong>$extra</strong>。');
 $lang->story->action->unlinkedfromrelease = array('main' => '$date, 由 <strong>$actor</strong> 從發佈 <strong>$extra</strong> 移除。');
-$lang->story->action->linkrelatedstory    = array('main' => "\$date, 由 <strong>\$actor</strong> 關聯相關{$lang->storyCommon} <strong>\$extra</strong>。");
-$lang->story->action->subdividestory      = array('main' => "\$date, 由 <strong>\$actor</strong> 細分為{$lang->storyCommon}   <strong>\$extra</strong>。");
-$lang->story->action->unlinkrelatedstory  = array('main' => "\$date, 由 <strong>\$actor</strong> 移除相關{$lang->storyCommon} <strong>\$extra</strong>。");
-$lang->story->action->unlinkchildstory    = array('main' => "\$date, 由 <strong>\$actor</strong> 移除細分{$lang->storyCommon} <strong>\$extra</strong>。");
+$lang->story->action->linkrelatedstory    = array('main' => "\$date, 由 <strong>\$actor</strong> 關聯相關{$lang->productSRCommon} <strong>\$extra</strong>。");
+$lang->story->action->subdividestory      = array('main' => "\$date, 由 <strong>\$actor</strong> 細分為{$lang->productSRCommon}   <strong>\$extra</strong>。");
+$lang->story->action->unlinkrelatedstory  = array('main' => "\$date, 由 <strong>\$actor</strong> 移除相關{$lang->productSRCommon} <strong>\$extra</strong>。");
+$lang->story->action->unlinkchildstory    = array('main' => "\$date, 由 <strong>\$actor</strong> 移除細分{$lang->productSRCommon} <strong>\$extra</strong>。");
 
 /* 統計報表。*/
 $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'] = '指派給';

module/task/control.php

@@ -213,7 +213,7 @@ class task extends control
         $this->view->title            = $title;
         $this->view->position         = $position;
         $this->view->project          = $project;
-        $this->view->projects         = $this->loadModel('project')->getExecutionPairs($this->session->PRJ);
+        $this->view->projects         = $this->loadModel('project')->getExecutionsByProject($this->session->PRJ, 'all', 0, true);
         $this->view->task             = $task;
         $this->view->users            = $users;
         $this->view->stories          = $stories;

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          = " <strong class='text-danger'> 延期%s天 </strong>";
 $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, 由 <strong>%s</strong> 添加备注。';
 $lang->task->deniedNotice          = '当前任务只有%s才可以%s。';

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          = " <strong class='text-danger'> 延期%s天 </strong>";
 $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, 由 <strong>%s</strong> 添加備註。';
 $lang->task->deniedNotice          = '當前任務只有%s才可以%s。';

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         = '<div>您现在还没有模块信息</div><div>请维护测试模块</div>';
 $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'];

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         = '<div>您現在還沒有模組信息</div><div>請維護測試模組</div>';
 $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'];

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        = '项目目标';

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        = '項目目標';

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       = '全部通过';

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       = '全部通過';

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  = '这是一条私人事务。:)';

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  = '這是一條私人事務。:)';

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       = '成功修正数据！';

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       = '成功修正數據！';

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'] = "<p>在系统创建一个新的{$lang->storyCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i> {$lang->storyCommon} <i class='icon icon-angle-right'></i> 添加{$lang->storyCommon}</span> 页面；</li><li data-target='form'>在表单中填写要创建的{$lang->storyCommon}信息；</li><li data-target='submit'>保存{$lang->storyCommon}信息。</li></ul>";
+    $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'] = "<p>在系统创建一个新的{$lang->productSRCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i> {$lang->productSRCommon} <i class='icon icon-angle-right'></i> 添加{$lang->productSRCommon}</span> 页面；</li><li data-target='form'>在表单中填写要创建的{$lang->productSRCommon}信息；</li><li data-target='submit'>保存{$lang->productSRCommon}信息。</li></ul>";
 }
 
 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'] = "<p>将{$lang->storyCommon}关联到{$lang->projectCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->storyCommon} <i class='icon icon-angle-right'></i> 关联{$lang->storyCommon}</span> 页面；</li><li data-target='form'>在{$lang->storyCommon}列表中勾选要关联的{$lang->storyCommon}；</li><li data-target='submit'>保存关联的{$lang->storyCommon}信息。</li></ul>";
+        $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'] = "<p>将{$lang->productSRCommon}关联到{$lang->projectCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->productSRCommon} <i class='icon icon-angle-right'></i> 关联{$lang->productSRCommon}</span> 页面；</li><li data-target='form'>在{$lang->productSRCommon}列表中勾选要关联的{$lang->productSRCommon}；</li><li data-target='submit'>保存关联的{$lang->productSRCommon}信息。</li></ul>";
     }
 
     $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'] = "<p>将{$lang->projectCommon}{$lang->storyCommon}分解为任务：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->storyCommon} <i class='icon icon-angle-right'></i> 分解任务</span> 页面；</li><li data-target='form'>在表单中填写任务信息；</li><li data-target='submit'>保存任务信息。</li></ul>";
+    $lang->tutorial->tasks['createTask']['desc'] = "<p>将{$lang->projectCommon}{$lang->productSRCommon}分解为任务：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->productSRCommon} <i class='icon icon-angle-right'></i> 分解任务</span> 页面；</li><li data-target='form'>在表单中填写任务信息；</li><li data-target='submit'>保存任务信息。</li></ul>";
 }
 
 if($config->global->flow == 'full' or $config->global->flow == 'onlyTest')

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'] = "<p>在系統創建一個新的{$lang->storyCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i> {$lang->storyCommon} <i class='icon icon-angle-right'></i> 添加{$lang->storyCommon}</span> 頁面；</li><li data-target='form'>在表單中填寫要創建的{$lang->storyCommon}信息；</li><li data-target='submit'>保存{$lang->storyCommon}信息。</li></ul>";
+    $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'] = "<p>在系統創建一個新的{$lang->productSRCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i> {$lang->productSRCommon} <i class='icon icon-angle-right'></i> 添加{$lang->productSRCommon}</span> 頁面；</li><li data-target='form'>在表單中填寫要創建的{$lang->productSRCommon}信息；</li><li data-target='submit'>保存{$lang->productSRCommon}信息。</li></ul>";
 }
 
 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'] = "<p>將{$lang->storyCommon}關聯到{$lang->projectCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->storyCommon} <i class='icon icon-angle-right'></i> 關聯{$lang->storyCommon}</span> 頁面；</li><li data-target='form'>在{$lang->storyCommon}列表中勾選要關聯的{$lang->storyCommon}；</li><li data-target='submit'>保存關聯的{$lang->storyCommon}信息。</li></ul>";
+        $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'] = "<p>將{$lang->productSRCommon}關聯到{$lang->projectCommon}：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->productSRCommon} <i class='icon icon-angle-right'></i> 關聯{$lang->productSRCommon}</span> 頁面；</li><li data-target='form'>在{$lang->productSRCommon}列表中勾選要關聯的{$lang->productSRCommon}；</li><li data-target='submit'>保存關聯的{$lang->productSRCommon}信息。</li></ul>";
     }
 
     $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'] = "<p>將{$lang->projectCommon}{$lang->storyCommon}分解為任務：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->storyCommon} <i class='icon icon-angle-right'></i> 分解任務</span> 頁面；</li><li data-target='form'>在表單中填寫任務信息；</li><li data-target='submit'>保存任務信息。</li></ul>";
+    $lang->tutorial->tasks['createTask']['desc'] = "<p>將{$lang->projectCommon}{$lang->productSRCommon}分解為任務：</p><ul><li data-target='nav'>打開 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->productSRCommon} <i class='icon icon-angle-right'></i> 分解任務</span> 頁面；</li><li data-target='form'>在表單中填寫任務信息；</li><li data-target='submit'>保存任務信息。</li></ul>";
 }
 
 if($config->global->flow == 'full' or $config->global->flow == 'onlyTest')

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']   = '创建的用例数';

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']   = '創建的用例數';

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')