From 9536d3caa8df209193c1d7774fb5638d4aeed215 Mon Sep 17 00:00:00 2001 From: dingguodong Date: Thu, 11 Nov 2021 14:05:47 +0800 Subject: [PATCH] * Fill in the missing code of action module for MR review. --- module/action/lang/en.php | 6 ++++++ module/action/lang/zh-cn.php | 6 ++++++ module/action/lang/zh-tw.php | 6 ++++++ module/action/model.php | 8 ++++---- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 65c117cd60..3018415276 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -674,3 +674,9 @@ $lang->action->apiTitle->reviewrejected = 'Review rejected'; $lang->action->apiTitle->reviewclarified = 'Review clarified'; $lang->action->apiTitle->commitsummary = 'Commit summary'; $lang->action->apiTitle->updatetrainee = 'Update trainee'; + +/* Code Review in Repo or Merge Request module. */ +$lang->action->desc->repocreated = '$date, created and reviewed by $actor: $extra.' . "\n"; +$lang->action->label->repocreated = "create and review"; +$lang->action->dynamicAction->task['gitcommited'] = 'Git Commit'; +$lang->action->dynamicAction->bug['repocreated'] = $lang->action->label->repocreated; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index b957726aae..56c9ca197b 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -674,3 +674,9 @@ $lang->action->apiTitle->reviewrejected = '拒绝'; $lang->action->apiTitle->reviewclarified = '有待明确'; $lang->action->apiTitle->commitsummary = '提交培训总结'; $lang->action->apiTitle->updatetrainee = '更新培训人员'; + +/* Code Review in Repo or Merge Request module. */ +$lang->action->desc->repocreated = '$date, 由 $actor 评审创建:$extra。' . "\n"; +$lang->action->label->repocreated = "创建评审"; +$lang->action->dynamicAction->task['gitcommited'] = 'git提交'; +$lang->action->dynamicAction->bug['repocreated'] = '创建代码评审'; diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php index 2d10a38721..dcf8b1df2b 100755 --- a/module/action/lang/zh-tw.php +++ b/module/action/lang/zh-tw.php @@ -674,3 +674,9 @@ $lang->action->apiTitle->reviewrejected = '拒絶'; $lang->action->apiTitle->reviewclarified = '有待明確'; $lang->action->apiTitle->commitsummary = '提交培訓總結'; $lang->action->apiTitle->updatetrainee = '更新培訓人員'; + +/* Code Review in Repo or Merge Request module. */ +$lang->action->desc->repocreated = '$date, 由 $actor 評審創建:$extra。' . "\n"; +$lang->action->label->repocreated = "創建評審"; +$lang->action->dynamicAction->task['gitcommited'] = 'git提交'; +$lang->action->dynamicAction->bug['repocreated'] = '創建代碼評審'; diff --git a/module/action/model.php b/module/action/model.php index 7a18b7d1db..6870571cf6 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -635,7 +635,7 @@ class actionModel extends model /** * Print actions of an object. * - * @param array $action + * @param object $action * @param string $desc * @access public * @return void @@ -939,9 +939,9 @@ class actionModel extends model /** * Transform the actions for display. * - * @param int $actions + * @param array $actions * @access public - * @return void + * @return object */ public function transformActions($actions) { @@ -1529,7 +1529,7 @@ class actionModel extends model /** * Print actions of an object for API(JIHU). * - * @param array $action + * @param object $action * @access public * @return void */