diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 7f2d8f82e6..0c2e2b5dd7 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -24,6 +24,8 @@ $lang->action->actionID = 'Action ID'; $lang->action->date = 'Date'; $lang->action->extra = 'Extra'; +$lang->action->system = 'System'; + $lang->action->trash = 'Recycle'; $lang->action->undelete = 'Restore'; $lang->action->hideOne = 'Hide'; @@ -268,7 +270,7 @@ $lang->action->label->run = 'run'; $lang->action->label->estimated = 'estimated'; $lang->action->label->reviewclosed = 'Review Failed'; $lang->action->label->passreviewed = 'Pass'; -$lang->action->label->clarifyreviewed = 'Clarify'; +$lang->action->label->clarifyreviewed = 'Review Failed'; $lang->action->label->commitsummary = 'Commit Summary'; $lang->action->label->updatetrainee = 'Update Trainee'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index ed8a3a787d..4b02f6a749 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -24,6 +24,8 @@ $lang->action->actionID = '记录ID'; $lang->action->date = '日期'; $lang->action->extra = '附加值'; +$lang->action->system = '系统'; + $lang->action->trash = '回收站'; $lang->action->undelete = '还原'; $lang->action->hideOne = '隐藏'; @@ -266,9 +268,9 @@ $lang->action->label->tracked = '跟踪了'; $lang->action->label->hangup = '挂起了'; $lang->action->label->run = '执行了'; $lang->action->label->estimated = '估算了'; -$lang->action->label->reviewclosed = '评审失败'; -$lang->action->label->passreviewed = '确认通过'; -$lang->action->label->clarifyreviewed = '有待明确'; +$lang->action->label->reviewclosed = '评审不通过'; +$lang->action->label->passreviewed = '评审通过'; +$lang->action->label->clarifyreviewed = '评审不通过'; $lang->action->label->commitsummary = '提交培训总结'; $lang->action->label->updatetrainee = '更新培训人员'; diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php index 2ac478afd3..7c4f9a2d07 100755 --- a/module/action/lang/zh-tw.php +++ b/module/action/lang/zh-tw.php @@ -24,6 +24,8 @@ $lang->action->actionID = '記錄ID'; $lang->action->date = '日期'; $lang->action->extra = '附加值'; +$lang->action->system = '系統'; + $lang->action->trash = '資源回收筒'; $lang->action->undelete = '還原'; $lang->action->hideOne = '隱藏'; @@ -266,9 +268,9 @@ $lang->action->label->tracked = '跟蹤了'; $lang->action->label->hangup = '掛起了'; $lang->action->label->run = '執行了'; $lang->action->label->estimated = '估算了'; -$lang->action->label->reviewclosed = '評審失敗'; -$lang->action->label->passreviewed = '確認通過'; -$lang->action->label->clarifyreviewed = '有待明確'; +$lang->action->label->reviewclosed = '評審不通過'; +$lang->action->label->passreviewed = '評審通過'; +$lang->action->label->clarifyreviewed = '評審不通過'; $lang->action->label->commitsummary = '提交培訓總結'; $lang->action->label->updatetrainee = '更新培訓人員'; diff --git a/module/action/model.php b/module/action/model.php index f1adc87c36..f3fbe9325c 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -49,7 +49,7 @@ class actionModel extends model $action->date = helper::now(); $action->extra = $extra; - if($objectType == 'story' and $actionType !== 'reviewed' and strpos(',reviewclosed,passreviewed,clarifyreviewed,', ",$actionType,") !== false) $action->actor = 'System'; + if($objectType == 'story' and $actionType !== 'reviewed' and strpos(',reviewclosed,passreviewed,clarifyreviewed,', ",$actionType,") !== false) $action->actor = $this->lang->action->system; /* Use purifier to process comment. Fix bug #2683. */ $action->comment = fixer::stripDataTags($comment); diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 6284468bf3..5eccdaf88b 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -285,12 +285,12 @@ $lang->story->form->file = "附件,如果该{$lang->SRCommon}有相关文 $lang->story->action = new stdclass(); $lang->story->action->reviewed = array('main' => '$date, 由 $actor 记录评审结果,结果为 $extra。', 'extra' => 'reviewResultList'); -$lang->story->action->passreviewed = array('main' => '$date, 由 系统 判定,结果为 确认通过。'); +$lang->story->action->passreviewed = array('main' => '$date, 由 系统 判定,结果为 评审通过。'); $lang->story->action->clarifyreviewed = array('main' => '$date, 由 系统 判定,结果为 评审不通过,请变更后重新发起评审。'); $lang->story->action->rejectreviewed = array('main' => '$date, 由 $actor 记录评审结果,结果为 $extra,原因为 $reason。', 'extra' => 'reviewResultList', 'reason' => 'reasonList'); $lang->story->action->recalled = array('main' => '$date, 由 $actor 撤销评审。'); $lang->story->action->closed = array('main' => '$date, 由 $actor 关闭,原因为 $extra $appendLink。', 'extra' => 'reasonList'); -$lang->story->action->reviewclosed = array('main' => '$date, 由 系统 关闭,原因为 评审失败。'); +$lang->story->action->reviewclosed = array('main' => '$date, 由 系统 关闭,原因为 评审不通过。'); $lang->story->action->linked2plan = array('main' => '$date, 由 $actor 关联到计划 $extra。'); $lang->story->action->unlinkedfromplan = array('main' => '$date, 由 $actor 从计划 $extra 移除。'); $lang->story->action->linked2execution = array('main' => '$date, 由 $actor 关联到' . $lang->executionCommon . ' $extra。'); diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php index 356ffb26f8..1f0241bb05 100644 --- a/module/story/lang/zh-tw.php +++ b/module/story/lang/zh-tw.php @@ -285,12 +285,12 @@ $lang->story->form->file = "附件,如果該{$lang->SRCommon}有相關檔 $lang->story->action = new stdclass(); $lang->story->action->reviewed = array('main' => '$date, 由 $actor 記錄評審結果,結果為 $extra。', 'extra' => 'reviewResultList'); -$lang->story->action->passreviewed = array('main' => '$date, 由 系統 判定,結果為 確認通過。'); +$lang->story->action->passreviewed = array('main' => '$date, 由 系統 判定,結果為 評審通過。'); $lang->story->action->clarifyreviewed = array('main' => '$date, 由 系統 判定,結果為 評審不通過,請變更後重新發起評審。'); $lang->story->action->rejectreviewed = array('main' => '$date, 由 $actor 記錄評審結果,結果為 $extra,原因為 $reason。', 'extra' => 'reviewResultList', 'reason' => 'reasonList'); $lang->story->action->recalled = array('main' => '$date, 由 $actor 撤銷評審。'); $lang->story->action->closed = array('main' => '$date, 由 $actor 關閉,原因為 $extra $appendLink。', 'extra' => 'reasonList'); -$lang->story->action->reviewclosed = array('main' => '$date, 由 系統 關閉,原因為 評審失敗。'); +$lang->story->action->reviewclosed = array('main' => '$date, 由 系統 關閉,原因為 評審不通過。'); $lang->story->action->linked2plan = array('main' => '$date, 由 $actor 關聯到計劃 $extra。'); $lang->story->action->unlinkedfromplan = array('main' => '$date, 由 $actor 從計劃 $extra 移除。'); $lang->story->action->linked2execution = array('main' => '$date, 由 $actor 關聯到' . $lang->executionCommon . ' $extra。');