summaryrefslogtreecommitdiff
path: root/app/views/notify/closed_merge_request_email.text.haml
diff options
context:
space:
mode:
authorLarry Li <larryli@qq.com>2016-03-24 06:21:03 +0800
committerLarry Li <larryli@qq.com>2016-03-24 06:21:03 +0800
commitb0a44cb0c867b2eec84ba8bb4ac303d829848195 (patch)
tree70e71494ecbe50706ba756c54ac3d6e440dcd7ae /app/views/notify/closed_merge_request_email.text.haml
parent3192db707183244bb21af382fe709c963ae96348 (diff)
downloadgitlab-ce-b0a44cb0c867b2eec84ba8bb4ac303d829848195.tar.gz
导入上一版本 8.5 汉化v8.6.0.zh0
Signed-off-by: Larry Li <larryli@qq.com>
Diffstat (limited to 'app/views/notify/closed_merge_request_email.text.haml')
-rw-r--r--app/views/notify/closed_merge_request_email.text.haml8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/notify/closed_merge_request_email.text.haml b/app/views/notify/closed_merge_request_email.text.haml
index 59db86b08bc..0d95bd046f6 100644
--- a/app/views/notify/closed_merge_request_email.text.haml
+++ b/app/views/notify/closed_merge_request_email.text.haml
@@ -1,8 +1,8 @@
-= "Merge Request ##{@merge_request.iid} was closed by #{@updated_by.name}"
+= "#{@updated_by.name} 关闭了合并请求 ##{@merge_request.iid}"
-Merge Request url: #{namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)}
+合并请求链接: #{namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)}
= merge_path_description(@merge_request, 'to')
-Author: #{@merge_request.author_name}
-Assignee: #{@merge_request.assignee_name}
+作者: #{@merge_request.author_name}
+指派给: #{@merge_request.assignee_name}