summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/_discussion.html.haml
diff options
context:
space:
mode:
authorLarry Li <larryli@qq.com>2016-03-28 12:39:17 +0800
committerLarry Li <larryli@qq.com>2016-03-28 12:39:17 +0800
commit44d920605c4d857d4e494e818042a0251e9ee203 (patch)
treed672721562140801486f6a0641e1eee32088a918 /app/views/projects/merge_requests/_discussion.html.haml
parentb0a44cb0c867b2eec84ba8bb4ac303d829848195 (diff)
downloadgitlab-ce-8.6.0.zh1.tar.gz
完成 8.6 分支初步翻译v8.6.0.zh1
Signed-off-by: Larry Li <larryli@qq.com>
Diffstat (limited to 'app/views/projects/merge_requests/_discussion.html.haml')
-rw-r--r--app/views/projects/merge_requests/_discussion.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml
index 393998f15b9..fdabcf57733 100644
--- a/app/views/projects/merge_requests/_discussion.html.haml
+++ b/app/views/projects/merge_requests/_discussion.html.haml
@@ -1,8 +1,8 @@
- content_for :note_actions do
- if can?(current_user, :update_merge_request, @merge_request)
- if @merge_request.open?
- = link_to 'Close merge request', merge_request_path(@merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-nr btn-comment btn-grouped btn-close close-mr-link js-note-target-close", title: "Close merge request", data: {original_text: "Close merge request", alternative_text: "Comment & close merge request"}
+ = link_to '关闭合并请求', merge_request_path(@merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-nr btn-comment btn-grouped btn-close close-mr-link js-note-target-close", title: "Close merge request", data: {original_text: "关闭合并请求", alternative_text: "评论 & 关闭合并请求"}
- if @merge_request.closed?
- = link_to 'Reopen merge request', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-nr btn-comment btn-grouped btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request", data: {original_text: "Reopen merge request", alternative_text: "Comment & reopen merge request"}
+ = link_to '重新打开合并请求', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-nr btn-comment btn-grouped btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request", data: {original_text: "重新打开合并请求", alternative_text: "评论 & 重新打开合并请求"}
#notes= render "projects/notes/notes_with_form"