diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/views/notify | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/views/notify')
10 files changed, 45 insertions, 41 deletions
diff --git a/app/views/notify/_issuable_csv_export.html.haml b/app/views/notify/_issuable_csv_export.html.haml index 239b5b14966..5a581811179 100644 --- a/app/views/notify/_issuable_csv_export.html.haml +++ b/app/views/notify/_issuable_csv_export.html.haml @@ -1,6 +1,6 @@ %p{ style: 'font-size:18px; text-align:center; line-height:30px;' } - project_link = link_to(@project.full_name, project_url(@project), style: "color:#3777b0; text-decoration:none; display:block;") - = _('Your CSV export of %{count} from project %{project_link} has been added to this email as an attachment.').html_safe % { count: pluralize(@written_count, type.to_s), project_link: project_link } + = _('Your CSV export of %{count} from project %{project_link} has been added to this email as an attachment.').html_safe % { count: pluralize(@written_count, type.to_s.titleize.downcase), project_link: project_link } - if @truncated %p = _('This attachment has been truncated to avoid exceeding the maximum allowed attachment size of 15MB. %{written_count} of %{count} issues have been included. Consider re-exporting with a narrower selection of issues.') % { written_count: @written_count, count: @count } diff --git a/app/views/notify/_note_email.html.haml b/app/views/notify/_note_email.html.haml index c558358725c..2cef6f97d48 100644 --- a/app/views/notify/_note_email.html.haml +++ b/app/views/notify/_note_email.html.haml @@ -9,7 +9,7 @@ = succeed ':' do = link_to note.author_name, user_url(note.author) - if discussion.nil? - commented + = link_to 'commented', target_url - else - if note.start_of_discussion? started a new diff --git a/app/views/notify/instance_access_request_email.html.haml b/app/views/notify/instance_access_request_email.html.haml new file mode 100644 index 00000000000..87bc655164b --- /dev/null +++ b/app/views/notify/instance_access_request_email.html.haml @@ -0,0 +1,10 @@ +#content + = email_default_heading(say_hello(@recipient)) + %p + = instance_access_request_text(@user, format: :html) + %p + = _("Username: %{username}") % { username: @user.username } + %p + = _("Email: %{email}") % { email: @user.email } + %p + = instance_access_request_link(@user, format: :html) diff --git a/app/views/notify/instance_access_request_email.text.erb b/app/views/notify/instance_access_request_email.text.erb new file mode 100644 index 00000000000..317f962a29c --- /dev/null +++ b/app/views/notify/instance_access_request_email.text.erb @@ -0,0 +1,8 @@ +<%= say_hello(@recipient) %> + +<%= instance_access_request_text(@user) %> + +<%= _("Username: %{username}") % { username: @user.username } %> +<%= _("Email: %{email}") % { email: @user.email } %> + +<%= instance_access_request_link(@user) %> diff --git a/app/views/notify/member_invited_email.html.haml b/app/views/notify/member_invited_email.html.haml index 4fcd2936d25..5ff1e2393c9 100644 --- a/app/views/notify/member_invited_email.html.haml +++ b/app/views/notify/member_invited_email.html.haml @@ -1,16 +1,12 @@ +- placeholders = { strong_start: '<strong>'.html_safe, strong_end: '</strong>'.html_safe, project_or_group_name: member_source.human_name, project_or_group: member_source.model_name.singular, br_tag: '<br/>'.html_safe, role: member.human_access.downcase } %tr %td.text-content + %h2.invite-header + = s_('InviteEmail|You are invited!') %p - You have been invited - if member.created_by - by - = link_to member.created_by.name, user_url(member.created_by) - to join the - = link_to member_source.human_name, member_source.public? ? member_source.web_url : invite_url(@token), class: :highlight - #{member_source.model_name.singular} as #{content_tag :span, member.human_access, class: :highlight}. - - %p - = link_to 'Accept invitation', invite_url(@token, @invite_url_params) - or - = link_to 'decline', decline_invite_url(@token) - + = html_escape(s_("InviteEmail|%{inviter} invited you to join the %{strong_start}%{project_or_group_name}%{strong_end}%{br_tag}%{project_or_group} as a %{role}")) % placeholders.merge({ inviter: (link_to member.created_by.name, user_url(member.created_by)).html_safe }) + - else + = html_escape(s_("InviteEmail|You are invited to join the %{strong_start}%{project_or_group_name}%{strong_end}%{br_tag}%{project_or_group} as a %{role}")) % placeholders + %p.invite-actions + = link_to s_('InviteEmail|Join now'), invite_url(@token), class: 'invite-btn-join' diff --git a/app/views/notify/member_invited_email.text.erb b/app/views/notify/member_invited_email.text.erb index e6e6a685f92..e58dfc10810 100644 --- a/app/views/notify/member_invited_email.text.erb +++ b/app/views/notify/member_invited_email.text.erb @@ -1,4 +1,9 @@ -You have been invited <%= "by #{sanitize_name(member.created_by.name)} " if member.created_by %>to join the <%= member_source.human_name %> <%= member_source.model_name.singular %> as <%= member.human_access %>. +<% placeholders = { project_or_group_name: member_source.human_name, project_or_group: member_source.model_name.singular, role: member.human_access.downcase } %> -Accept invitation: <%= invite_url(@token, @invite_url_params) %> -Decline invitation: <%= decline_invite_url(@token) %> +<% if member.created_by %> +<%= s_('InviteEmail|%{inviter} invited you to join the %{project_or_group_name} %{project_or_group} as a %{role}') % placeholders.merge({ inviter: sanitize_name(member.created_by.name) }) %> +<% else %> +<%= s_('InviteEmail|You have been invited to join the %{project_or_group_name} %{project_or_group} as a %{role}') % placeholders %> +<% end %> + +<%= s_('InviteEmail|Join now') %>: <%= invite_url(@token) %> diff --git a/app/views/notify/member_invited_email_experiment.html.haml b/app/views/notify/member_invited_email_experiment.html.haml deleted file mode 100644 index 5cfb6acee05..00000000000 --- a/app/views/notify/member_invited_email_experiment.html.haml +++ /dev/null @@ -1,12 +0,0 @@ -%tr - %td.text-content - %h2.invite-header - = s_('InviteEmail|You are invited!') - %p - - if member.created_by - = html_escape(s_("InviteEmail|%{inviter} invited you")) % { inviter: (link_to member.created_by.name, user_url(member.created_by)).html_safe } - = html_escape(s_("InviteEmail|to join the %{strong_start}%{project_or_group_name}%{strong_end}")) % { strong_start: '<strong>'.html_safe, strong_end: '</strong>'.html_safe, project_or_group_name: member_source.human_name } - %br - = s_("InviteEmail|%{project_or_group} as a %{role}") % { project_or_group: member_source.model_name.singular, role: member.human_access.downcase } - %p.invite-actions - = link_to s_('InviteEmail|Join now'), invite_url(@token, @invite_url_params), class: 'invite-btn-join' diff --git a/app/views/notify/member_invited_email_experiment.text.erb b/app/views/notify/member_invited_email_experiment.text.erb deleted file mode 100644 index 6843cea4df7..00000000000 --- a/app/views/notify/member_invited_email_experiment.text.erb +++ /dev/null @@ -1,10 +0,0 @@ -<% project_and_role = s_('InviteEmail|to join the %{project_or_group_name} %{project_or_group} as a %{role}') \ - % { project_or_group_name: member_source.human_name, project_or_group: member_source.model_name.singular, role: member.human_access.downcase } %> - -<% if member.created_by %> -<%= s_('InviteEmail|%{inviter} invited you') % { inviter: sanitize_name(member.created_by.name) } %> <%= project_and_role %> -<% else %> -<%= s_('InviteEmail|You have been invited') %> <%= project_and_role %> -<% end %> - -Join now: <%= invite_url(@token, @invite_url_params) %> diff --git a/app/views/notify/prometheus_alert_fired_email.html.haml b/app/views/notify/prometheus_alert_fired_email.html.haml index 75ba66b44f9..cdc97d583df 100644 --- a/app/views/notify/prometheus_alert_fired_email.html.haml +++ b/app/views/notify/prometheus_alert_fired_email.html.haml @@ -1,5 +1,9 @@ +- body = @alert.resolved? ? _('An alert has been resolved in %{project_path}.') : _('An alert has been triggered in %{project_path}.') + +%p + = body % { project_path: @alert.project.full_path } %p - = _('An alert has been triggered in %{project_path}.') % { project_path: @alert.project.full_path } + = link_to(_('View alert details.'), @alert.details_url) - if description = @alert.description %p diff --git a/app/views/notify/prometheus_alert_fired_email.text.erb b/app/views/notify/prometheus_alert_fired_email.text.erb index 8853f2a317b..b23cd8b6ccc 100644 --- a/app/views/notify/prometheus_alert_fired_email.text.erb +++ b/app/views/notify/prometheus_alert_fired_email.text.erb @@ -1,4 +1,7 @@ -<%= _('An alert has been triggered in %{project_path}.') % { project_path: @alert.project.full_path } %>. +<% body = @alert.resolved? ? _('An alert has been resolved in %{project_path}.') : _('An alert has been triggered in %{project_path}.') %> + +<%= body % { project_path: @alert.project.full_path } %> +<%= _('View alert details at') %> <%= @alert.details_url %> <% if description = @alert.description %> <%= _('Description:') %> <%= description %> |