diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php index 455c988dc4..f56b32277d 100644 --- a/module/mr/lang/en.php +++ b/module/mr/lang/en.php @@ -76,6 +76,7 @@ $lang->mr->acceptMR = "Accept Merge request "; $lang->mr->mergeFailed = "Unable to merge request, please check the merge request status"; $lang->mr->mergeSuccess = "Merge Request Successfully"; +$lang->mr->todomessage = "project was assigned to you"; /** * Merge Command Document. * diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php index 2d3c7a53df..698b91ce81 100644 --- a/module/mr/lang/zh-cn.php +++ b/module/mr/lang/zh-cn.php @@ -55,7 +55,6 @@ $lang->mr->accessGitlabFailed = "当前无法连接到GitLab服务器。"; $lang->mr->from = "从"; $lang->mr->to = "合并到"; $lang->mr->at = "于"; -$lang->mr->on = "在"; $lang->mr->pipeline = "流水线"; $lang->mr->pipelineSuccess = "已通过"; diff --git a/module/mr/model.php b/module/mr/model.php index 61ef909f53..db71b79297 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -333,7 +333,7 @@ class mrModel extends model $todo->idvalue = $rawTodo->id; $todo->pri = 3; $todo->name = $this->lang->mr->common . ": " . $rawTodo->target->title; - $todo->desc = $rawTodo->target->assignee->name . $this->lang->mr->on . '' . $rawTodo->project->path .'' . $this->lang->mr->todomessage . '' . $this->lang->mr->common .'' . '。'; + $todo->desc = $rawTodo->target->assignee->name . ' ' . $this->lang->mr->at . ' ' . '' . $rawTodo->project->path .'' . ' ' . $this->lang->mr->todomessage . '' . ' ' . $this->lang->mr->common .'' . '。'; $todo->status = 'wait'; $todo->finishedBy = '';