Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #14289.

Browse Source
This commit is contained in:
hufangzhou
2021-08-16 09:14:56 +08:00
parent aefb968d9a
commit 5237f1649c
6 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+3 -1
View File
@@ -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';
module/action/lang/zh-cn.php
+5 -3
View File
@@ -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 = '更新培训人员';
module/action/lang/zh-tw.php
+5 -3
View File
@@ -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 = '更新培訓人員';
module/action/model.php
+1 -1
View File
@@ -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);
module/story/lang/zh-cn.php
+2 -2
View File
@@ -285,12 +285,12 @@ $lang->story->form->file = "附件，如果该{$lang->SRCommon}有相关文
$lang->story->action = new stdclass();
$lang->story->action->reviewed = array('main' => '$date, 由 <strong>$actor</strong> 记录评审结果，结果为 <strong>$extra</strong>。', 'extra' => 'reviewResultList');
$lang->story->action->passreviewed = array('main' => '$date, 由 <strong>系统</strong> 判定，结果为 <strong>确认通过</strong>。');
$lang->story->action->passreviewed = array('main' => '$date, 由 <strong>系统</strong> 判定，结果为 <strong>评审通过</strong>。');
$lang->story->action->clarifyreviewed = array('main' => '$date, 由 <strong>系统</strong> 判定，结果为 <strong>评审不通过</strong>，请变更后重新发起评审。');
$lang->story->action->rejectreviewed = array('main' => '$date, 由 <strong>$actor</strong> 记录评审结果，结果为 <strong>$extra</strong>，原因为 <strong>$reason</strong>。', 'extra' => 'reviewResultList', 'reason' => 'reasonList');
$lang->story->action->recalled = array('main' => '$date, 由 <strong>$actor</strong> 撤销评审。');
$lang->story->action->closed = array('main' => '$date, 由 <strong>$actor</strong> 关闭，原因为 <strong>$extra</strong> $appendLink。', 'extra' => 'reasonList');
$lang->story->action->reviewclosed = array('main' => '$date, 由 <strong>系统</strong> 关闭，原因为 <strong>评审失败</strong>。');
$lang->story->action->reviewclosed = array('main' => '$date, 由 <strong>系统</strong> 关闭，原因为 <strong>评审不通过</strong>。');
$lang->story->action->linked2plan = array('main' => '$date, 由 <strong>$actor</strong> 关联到计划 <strong>$extra</strong>。');
$lang->story->action->unlinkedfromplan = array('main' => '$date, 由 <strong>$actor</strong> 从计划 <strong>$extra</strong> 移除。');
$lang->story->action->linked2execution = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->executionCommon . ' <strong>$extra</strong>。');
module/story/lang/zh-tw.php
+2 -2
View File
@@ -285,12 +285,12 @@ $lang->story->form->file = "附件，如果該{$lang->SRCommon}有相關檔
$lang->story->action = new stdclass();
$lang->story->action->reviewed = array('main' => '$date, 由 <strong>$actor</strong> 記錄評審結果，結果為 <strong>$extra</strong>。', 'extra' => 'reviewResultList');
$lang->story->action->passreviewed = array('main' => '$date, 由 <strong>系統</strong> 判定，結果為 <strong>確認通過</strong>。');
$lang->story->action->passreviewed = array('main' => '$date, 由 <strong>系統</strong> 判定，結果為 <strong>評審通過</strong>。');
$lang->story->action->clarifyreviewed = array('main' => '$date, 由 <strong>系統</strong> 判定，結果為 <strong>評審不通過</strong>，請變更後重新發起評審。');
$lang->story->action->rejectreviewed = array('main' => '$date, 由 <strong>$actor</strong> 記錄評審結果，結果為 <strong>$extra</strong>，原因為 <strong>$reason</strong>。', 'extra' => 'reviewResultList', 'reason' => 'reasonList');
$lang->story->action->recalled = array('main' => '$date, 由 <strong>$actor</strong> 撤銷評審。');
$lang->story->action->closed = array('main' => '$date, 由 <strong>$actor</strong> 關閉，原因為 <strong>$extra</strong> $appendLink。', 'extra' => 'reasonList');
$lang->story->action->reviewclosed = array('main' => '$date, 由 <strong>系統</strong> 關閉，原因為 <strong>評審失敗</strong>。');
$lang->story->action->reviewclosed = array('main' => '$date, 由 <strong>系統</strong> 關閉，原因為 <strong>評審不通過</strong>。');
$lang->story->action->linked2plan = array('main' => '$date, 由 <strong>$actor</strong> 關聯到計劃 <strong>$extra</strong>。');
$lang->story->action->unlinkedfromplan = array('main' => '$date, 由 <strong>$actor</strong> 從計劃 <strong>$extra</strong> 移除。');
$lang->story->action->linked2execution = array('main' => '$date, 由 <strong>$actor</strong> 關聯到' . $lang->executionCommon . ' <strong>$extra</strong>。');