diff --git a/module/action/model.php b/module/action/model.php index 85c8c7941b..84ecbe3297 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -439,6 +439,7 @@ class actionModel extends model if(is_array($desc)) { $extra = strtolower($action->extra); + if(isset($desc['extra'])) $desc['extra'] = $this->lang->$objectType->{$desc['extra']}; if(isset($desc['extra'][$extra])) { echo str_replace('$extra', $desc['extra'][$extra], $desc['main']); diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index f76f720934..b0bb7f2144 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -352,7 +352,7 @@ $lang->bug->report->bugHistories->graph->xAxisName = 'Histories'; /* 操作记录。*/ $lang->bug->action = new stdclass(); -$lang->bug->action->resolved = array('main' => '$date, Resolved by $actor, resolution is $extra.', 'extra' => $lang->bug->resolutionList); +$lang->bug->action->resolved = array('main' => '$date, Resolved by $actor, resolution is $extra.', 'extra' => 'resolutionList'); $lang->bug->action->tostory = array('main' => '$date, To story by $actor, ID is $extra.'); $lang->bug->action->totask = array('main' => '$date, To task by $actor, ID is $extra.'); $lang->bug->action->linked2plan = array('main' => '$date, 由 $actor 关联到计划 $extra。'); diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 3d7a6a67bf..48e2f8227f 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -352,7 +352,7 @@ $lang->bug->report->bugHistories->graph->xAxisName = '处理步骤'; /* 操作记录。*/ $lang->bug->action = new stdclass(); -$lang->bug->action->resolved = array('main' => '$date, 由 $actor 解决,方案为 $extra。', 'extra' => $lang->bug->resolutionList); +$lang->bug->action->resolved = array('main' => '$date, 由 $actor 解决,方案为 $extra。', 'extra' => 'resolutionList'); $lang->bug->action->tostory = array('main' => '$date, 由 $actor 转为需求,编号为 $extra。'); $lang->bug->action->totask = array('main' => '$date, 由 $actor 导入为任务,编号为 $extra。'); $lang->bug->action->linked2plan = array('main' => '$date, 由 $actor 关联到计划 $extra。'); diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 78d7c8b39a..bc5d0c8251 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -189,8 +189,8 @@ $lang->story->form->resource = 'Allocation of resources, who completed? How lon $lang->story->form->file = 'Attachments, if the demand for related documents, please click here to upload.'; $lang->story->action = new stdclass(); -$lang->story->action->reviewed = array('main' => '$date, reviewed by $actor, result is $extra.', 'extra' => $lang->story->reviewResultList); -$lang->story->action->closed = array('main' => '$date, closed by $actor, reason is $extra.', 'extra' => $lang->story->reasonList); +$lang->story->action->reviewed = array('main' => '$date, reviewed by $actor, result is $extra.', 'extra' => 'reviewResultList'); +$lang->story->action->closed = array('main' => '$date, closed by $actor, reason is $extra.', 'extra' => 'reasonList'); $lang->story->action->linked2plan = array('main' => '$date, linked to plan $extra by $actor.'); $lang->story->action->unlinkedfromplan = array('main' => '$date, removed from $extra> by $actor'); $lang->story->action->linked2project = array('main' => '$date, linked to ' . $lang->projectCommon . ' $extra by $actor.'); diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 963a17df8a..9375df1d79 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -189,8 +189,8 @@ $lang->story->form->resource = '资源分配,有谁完成?需要多少时 $lang->story->form->file = '附件,如果该需求有相关文件,请点此上传。'; $lang->story->action = new stdclass(); -$lang->story->action->reviewed = array('main' => '$date, 由 $actor 记录评审结果,结果为 $extra。', 'extra' => $lang->story->reviewResultList); -$lang->story->action->closed = array('main' => '$date, 由 $actor 关闭,原因为 $extra。', 'extra' => $lang->story->reasonList); +$lang->story->action->reviewed = array('main' => '$date, 由 $actor 记录评审结果,结果为 $extra。', 'extra' => 'reviewResultList'); +$lang->story->action->closed = array('main' => '$date, 由 $actor 关闭,原因为 $extra。', 'extra' => 'reasonList'); $lang->story->action->linked2plan = array('main' => '$date, 由 $actor 关联到计划 $extra。'); $lang->story->action->unlinkedfromplan = array('main' => '$date, 由 $actor 从计划 $extra 移除。'); $lang->story->action->linked2project = array('main' => '$date, 由 $actor 关联到' . $lang->projectCommon . ' $extra。'); diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index 43543f43af..083454795c 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -80,5 +80,5 @@ $lang->todo->periods['all'] = 'All'; $lang->todo->action = new stdclass(); $lang->todo->action->finished = array('main' => '$date, Finished by $actor'); -$lang->todo->action->marked = array('main' => '$date, Change status to $extra by $actor。', 'extra' => $lang->todo->statusList); +$lang->todo->action->marked = array('main' => '$date, Change status to $extra by $actor。', 'extra' => 'statusList'); diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index 810a8d6369..60ef9d6ae6 100644 --- a/module/todo/lang/zh-cn.php +++ b/module/todo/lang/zh-cn.php @@ -80,5 +80,5 @@ $lang->todo->periods['all'] = '所有'; $lang->todo->action = new stdclass(); $lang->todo->action->finished = array('main' => '$date, 由 $actor完成'); -$lang->todo->action->marked = array('main' => '$date, 由 $actor 标记为$extra。', 'extra' => $lang->todo->statusList); +$lang->todo->action->marked = array('main' => '$date, 由 $actor 标记为$extra。', 'extra' => 'statusList');