summaryrefslogtreecommitdiff
path: root/app/views/notify/repository_push_email.text.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/notify/repository_push_email.text.haml')
-rw-r--r--app/views/notify/repository_push_email.text.haml18
1 files changed, 9 insertions, 9 deletions
diff --git a/app/views/notify/repository_push_email.text.haml b/app/views/notify/repository_push_email.text.haml
index 53869e36b28..8b9817ac724 100644
--- a/app/views/notify/repository_push_email.text.haml
+++ b/app/views/notify/repository_push_email.text.haml
@@ -1,19 +1,19 @@
-#{@message.author_name} #{@message.action_name} #{@message.ref_type} #{@message.ref_name} at #{@message.project_name_with_namespace}
+#{@message.author_name} #{@message.action_name} #{@message.ref_type} #{@message.ref_name} 在 #{@message.project_name_with_namespace}
- if @message.compare
\
\
- if @message.reverse_compare?
- WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below.
+ 警告:此推送不包含任何提交,但强制推送会删除下面的提交和变更。
\
\
- = @message.reverse_compare? ? "Deleted commits:" : "Commits:"
+ = @message.reverse_compare? ? "删除的提交:" : "提交:"
- @message.commits.each do |commit|
- #{commit.short_id} by #{commit.author_name} at #{commit.committed_date.to_s(:iso8601)}
+ #{commit.short_id} by #{commit.author_name} 在 #{commit.committed_date.to_s(:iso8601)}
#{commit.safe_message}
\- - - - -
\
\
- #{pluralize @message.diffs_count, "changed file"}:
+ #{pluralize @message.diffs_count, "个修改的文件", "个修改的文件"}:
\
- @message.diffs.each do |diff|
- if diff.deleted_file
@@ -27,12 +27,12 @@
- unless @message.disable_diffs?
\
\
- Changes:
+ 变更:
- @message.diffs.each do |diff|
\
\=====================================
- if diff.deleted_file
- #{diff.old_path} deleted
+ #{diff.old_path} 已删除
- elsif diff.renamed_file
#{diff.old_path} → #{diff.new_path}
- else
@@ -42,8 +42,8 @@
- if @message.compare_timeout
\
\
- Huge diff. To prevent performance issues it was hidden
+ 巨大差异。因为性能原因隐藏问题变更
- if @message.target_url
\
\
- View it on GitLab: #{@message.target_url}
+ 在 GitLab 上查看: #{@message.target_url}