summaryrefslogtreecommitdiff
path: root/app/views/events/event/_push.html.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/events/event/_push.html.haml')
-rw-r--r--app/views/events/event/_push.html.haml10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml
index 235bd46107e..ff61873bec8 100644
--- a/app/views/events/event/_push.html.haml
+++ b/app/views/events/event/_push.html.haml
@@ -21,7 +21,7 @@
- if event.commits_count > 1
%li.commits-stat
- if event.commits_count > 2
- %span ... and #{event.commits_count - 2} more commits.
+ %span ... 和 #{event.commits_count - 2} 次更多提交。
- if event.md_ref?
- from = event.commit_from
@@ -31,14 +31,14 @@
- from_label = from
= link_to namespace_project_compare_path(event.project.namespace, event.project, from: from, to: event.commit_to) do
- Compare #{from_label}...#{truncate_sha(event.commit_to)}
+ 比较 #{from_label}...#{truncate_sha(event.commit_to)}
- if create_mr
%span{"data-user-is" => event.author_id, "data-display" => "inline"}
- or
+ 或
= link_to create_mr_path(event.project.default_branch, event.ref_name, event.project) do
- create a merge request
+ 创建合并请求
- elsif create_mr
%li.commits-stat{"data-user-is" => event.author_id}
= link_to create_mr_path(event.project.default_branch, event.ref_name, event.project) do
- Create Merge Request
+ 创建合并请求