diff --git a/module/score/config.php b/module/score/config.php index 017a3da0fd..69926a8b38 100644 --- a/module/score/config.php +++ b/module/score/config.php @@ -77,7 +77,7 @@ $config->score->rule->search->saveQueryAdvanced = array('times' => 1, 'hour' => $config->score->ruleExtended->storyclose = array('createID' => 2); $config->score->ruleExtended->userchangePassword = array('strength' => array(1 => 2, 2 => 5)); -$config->score->ruleExtended->taskfinish = array('pri' => array(1 => 2, 2 => 1, 3 => 0)); $config->score->ruleExtended->bugconfirmBug = array('severity' => array(1 => 3, 2 => 2, 3 => 1)); -$config->score->ruleExtended->bugrresolve = array('severity' => array(1 => 3, 2 => 2, 3 => 1)); +$config->score->ruleExtended->bugresolve = array('severity' => array(1 => 3, 2 => 2, 3 => 1)); +$config->score->ruleExtended->taskfinish = array('pri' => array(1 => 2, 2 => 1, 3 => 0)); $config->score->ruleExtended->projectclose = array('manager' => array('close' => 20, 'in' => 10), 'member' => array('close' => 5, 'in' => 5)); \ No newline at end of file diff --git a/module/score/lang/en.php b/module/score/lang/en.php index 681fcb22d5..aad855b7d4 100644 --- a/module/score/lang/en.php +++ b/module/score/lang/en.php @@ -81,9 +81,9 @@ $lang->score->methods['search']['saveQuery'] = 'Save search query'; $lang->score->methods['search']['saveQueryAdvanced'] = 'Advanced search'; $lang->score->extended = new stdClass(); -$lang->score->extended->userchangePassword = 'Password strength, medium:add extra score : #strength,1#; Strong:add extra score : #strength,2#.'; -$lang->score->extended->projectclose = 'Project closed, PM add extra score : #manager,close#,Team member add extra score : #member,close#. Completed on schedule or in advance,PM add extra score : #manager,in#,Team member Add extra score : #member,in#.'; -$lang->score->extended->bugresolve = 'Bug resolved, Add extra severity score :s1 + #severity,3#, s2 + #severity,2#, s3 + #severity,1#。'; -$lang->score->extended->bugconfirmBug = 'Bug confirmed, Add extra severity score :s1 + #severity,3#, s2 + #severity,2#, s3 + #severity,1#。'; -$lang->score->extended->taskfinish = 'Task finished, Add extra score round(consumed /10 * estimate / consumed) + severity score(p1 #pri,1#, p2, #pri,2#)。'; -$lang->score->extended->storyclose = 'Add extra score for story creator : #createID#.'; +$lang->score->extended->userchangePassword = 'Password strength, medium:add extra score : ##strength,1##; Strong:add extra score : ##strength,2##.'; +$lang->score->extended->projectclose = 'Project closed, PM add extra score : ##manager,close##,Team member add extra score : ##member,close##. Completed on schedule or in advance,PM add extra score : ##manager,in##,Team member Add extra score : ##member,in##.'; +$lang->score->extended->bugresolve = 'Bug resolved, Add extra severity score :s1 + ##severity,3##, s2 + ##severity,2##, s3 + ##severity,1##。'; +$lang->score->extended->bugconfirmBug = 'Bug confirmed, Add extra severity score :s1 + ##severity,3##, s2 + ##severity,2##, s3 + ##severity,1##。'; +$lang->score->extended->taskfinish = 'Task finished, Add extra score round(consumed /10 * estimate / consumed) + severity score(p1 ##pri,1##, p2, ##pri,2##)。'; +$lang->score->extended->storyclose = 'Add extra score for story creator : ##createID##.'; diff --git a/module/score/lang/zh-cn.php b/module/score/lang/zh-cn.php index 526ef1c33e..ae5b1046b8 100644 --- a/module/score/lang/zh-cn.php +++ b/module/score/lang/zh-cn.php @@ -81,9 +81,9 @@ $lang->score->methods['search']['saveQuery'] = '保存搜索条件'; $lang->score->methods['search']['saveQueryAdvanced'] = '使用高级搜索'; $lang->score->extended = new stdClass(); -$lang->score->extended->userchangePassword = '密码强度为中,额外获得#strength,1#个积分;为强,额外获得#strength,2#个积分。'; -$lang->score->extended->projectclose = '项目经理增加#manager,close#个积分,项目成员增加#member,close#个积分。按期或者提前完成,项目经理额外增加#manager,in#个积分,项目成员额外增加#member,in#个积分。'; -$lang->score->extended->bugresolve = 'Bug解决后,额外增加严重程度积分:s1 + #severity,3#, s2 + #severity,2#, s3 + #severity,1#。'; -$lang->score->extended->bugconfirmBug = 'Bug确认后,额外增加严重程度积分:s1 + #severity,3#, s2 + #severity,2#, s3 + #severity,1#。'; -$lang->score->extended->taskfinish = '额外增加工时积分 round(工时 / 10 * 预计 / 消耗) + 优先级积分(p1 #pri,1#, p2 #pri,2#)。'; -$lang->score->extended->storyclose = '需求的创建者额外增加#,createID#分'; +$lang->score->extended->userchangePassword = '密码强度为中,额外获得##strength,1##个积分;为强,额外获得##strength,2##个积分。'; +$lang->score->extended->projectclose = '项目经理增加##manager,close##个积分,项目成员增加##member,close##个积分。按期或者提前完成,项目经理额外增加##manager,in##个积分,项目成员额外增加##member,in##个积分。'; +$lang->score->extended->bugresolve = 'Bug解决后,额外增加严重程度积分:s1 + ##severity,3##, s2 + ##severity,2##, s3 + ##severity,1##。'; +$lang->score->extended->bugconfirmBug = 'Bug确认后,额外增加严重程度积分:s1 + ##severity,3##, s2 + ##severity,2##, s3 + ##severity,1##。'; +$lang->score->extended->taskfinish = '额外增加工时积分 round(工时 / 10 * 预计 / 消耗) + 优先级积分(p1 ##pri,1##, p2 ##pri,2##)。'; +$lang->score->extended->storyclose = '需求的创建者额外增加##createID##分'; diff --git a/module/score/lang/zh-tw.php b/module/score/lang/zh-tw.php index 008ba6b754..c809eb3cda 100644 --- a/module/score/lang/zh-tw.php +++ b/module/score/lang/zh-tw.php @@ -81,9 +81,9 @@ $lang->score->methods['search']['saveQuery'] = '保存搜索條件'; $lang->score->methods['search']['saveQueryAdvanced'] = '使用高級搜索'; $lang->score->extended = new stdClass(); -$lang->score->extended->userchangePassword = '密碼強度中的,額外獲得#strength,1#個積分,強的,額外獲得#strength,2#個積分。'; -$lang->score->extended->projectclose = '項目經理增加#manager,close#個積分,項目成員增加#member,close#個積分。按期或者提前完成,項目經理額外增加#manager,in#個積分,項目成員額外增加#member,in#個積分。'; -$lang->score->extended->bugresolve = 'Bug解決後,額外增加嚴重程度積分:s1 + #severity,3#, s2 + #severity,2#, s3 + #severity,1#。'; -$lang->score->extended->bugconfirmBug = 'Bug確認後,額外增加嚴重程度積分:s1 + #severity,3#, s2 + #severity,2#, s3 + #severity,1#。'; -$lang->score->extended->taskfinish = '額外增加工時積分 round(工時 /10 * 預計 / 消耗) + 優先順序積分(p1 #pri,1#, p2, #pri,2#)。'; -$lang->score->extended->storyclose = '需求的創建者額外增加#createID#分'; \ No newline at end of file +$lang->score->extended->userchangePassword = '密碼強度中的,額外獲得##strength,1##個積分,強的,額外獲得##strength,2##個積分。'; +$lang->score->extended->projectclose = '項目經理增加##manager,close##個積分,項目成員增加##member,close##個積分。按期或者提前完成,項目經理額外增加##manager,in##個積分,項目成員額外增加##member,in##個積分。'; +$lang->score->extended->bugresolve = 'Bug解決後,額外增加嚴重程度積分:s1 + ##severity,3##, s2 + ##severity,2##, s3 + ##severity,1##。'; +$lang->score->extended->bugconfirmBug = 'Bug確認後,額外增加嚴重程度積分:s1 + ##severity,3##, s2 + ##severity,2##, s3 + ##severity,1##。'; +$lang->score->extended->taskfinish = '額外增加工時積分 round(工時 /10 * 預計 / 消耗) + 優先順序積分(p1 ##pri,1##, p2, ##pri,2##)。'; +$lang->score->extended->storyclose = '需求的創建者額外增加##createID##分'; \ No newline at end of file diff --git a/module/score/view/rule.html.php b/module/score/view/rule.html.php index e172bf21dc..55566f1866 100644 --- a/module/score/view/rule.html.php +++ b/module/score/view/rule.html.php @@ -41,7 +41,7 @@ if(isset($lang->score->extended->{$module . $method})) { $desc = $lang->score->extended->{$module . $method}; - $descRule = explode('#', $desc); + $descRule = explode('##', $desc); if(!empty($descRule)) { foreach($descRule as $key => $value) @@ -57,7 +57,7 @@ { $score = $this->config->score->ruleExtended->{$module . $method}[$match[0]]; } - $desc = str_replace('#' . $value . '#', $score, $desc); + $desc = str_replace('##' . $value . '##', $score, $desc); } } }