diff options
Diffstat (limited to 'app/views/notify')
11 files changed, 23 insertions, 11 deletions
diff --git a/app/views/notify/_relabeled_issuable_email.text.erb b/app/views/notify/_relabeled_issuable_email.text.erb index 6a83d79fd61..dc399ef548d 100644 --- a/app/views/notify/_relabeled_issuable_email.text.erb +++ b/app/views/notify/_relabeled_issuable_email.text.erb @@ -1,3 +1,3 @@ <%= 'Label'.pluralize(@label_names.size) %> added: <%= @label_names.to_sentence %> -<%= url_for([issuable.project.namespace.becomes(Namespace), issuable.project, issuable, { only_path: false }]) %> +<%= url_for([issuable.project, issuable, { only_path: false }]) %> diff --git a/app/views/notify/access_token_about_to_expire_email.html.haml b/app/views/notify/access_token_about_to_expire_email.html.haml index d1923e324f7..240c7300c7f 100644 --- a/app/views/notify/access_token_about_to_expire_email.html.haml +++ b/app/views/notify/access_token_about_to_expire_email.html.haml @@ -4,4 +4,4 @@ = _('One or more of your personal access tokens will expire in %{days_to_expire} days or less.') % { days_to_expire: @days_to_expire } %p - pat_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: @target_url } - = _('You can create a new one or check them in your %{pat_link_start}Personal Access Tokens%{pat_link_end} settings').html_safe % { pat_link_start: pat_link_start, pat_link_end: '</a>'.html_safe } + = html_escape(_('You can create a new one or check them in your %{pat_link_start}personal access tokens%{pat_link_end} settings')) % { pat_link_start: pat_link_start, pat_link_end: '</a>'.html_safe } diff --git a/app/views/notify/access_token_about_to_expire_email.text.erb b/app/views/notify/access_token_about_to_expire_email.text.erb index 5e6bd68d33f..edcec51aeb4 100644 --- a/app/views/notify/access_token_about_to_expire_email.text.erb +++ b/app/views/notify/access_token_about_to_expire_email.text.erb @@ -2,4 +2,4 @@ <%= _('One or more of your personal access tokens will expire in %{days_to_expire} days or less.') % { days_to_expire: @days_to_expire} %> -<%= _('You can create a new one or check them in your Personal Access Tokens settings %{pat_link}') % { pat_link: @target_url } %> +<%= _('You can create a new one or check them in your personal access tokens settings %{pat_link}') % { pat_link: @target_url } %> diff --git a/app/views/notify/access_token_expired_email.html.haml b/app/views/notify/access_token_expired_email.html.haml new file mode 100644 index 00000000000..b26431cce91 --- /dev/null +++ b/app/views/notify/access_token_expired_email.html.haml @@ -0,0 +1,7 @@ +%p + = _('Hi %{username}!') % { username: sanitize_name(@user.name) } +%p + = _('One or more of your personal access tokens has expired.') +%p + - pat_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: @target_url } + = html_escape(_('You can create a new one or check them in your %{pat_link_start}personal access tokens%{pat_link_end} settings')) % { pat_link_start: pat_link_start, pat_link_end: '</a>'.html_safe } diff --git a/app/views/notify/access_token_expired_email.text.erb b/app/views/notify/access_token_expired_email.text.erb new file mode 100644 index 00000000000..d44f993d094 --- /dev/null +++ b/app/views/notify/access_token_expired_email.text.erb @@ -0,0 +1,5 @@ +<%= _('Hi %{username}!') % { username: sanitize_name(@user.name) } %> + +<%= _('One or more of your personal access tokens has expired.') %> + +<%= _('You can create a new one or check them in your personal access tokens settings %{pat_link}') % { pat_link: @target_url } %> diff --git a/app/views/notify/reassigned_issue_email.text.erb b/app/views/notify/reassigned_issue_email.text.erb index 7bf2e8e6ce3..dc0d8fc80b0 100644 --- a/app/views/notify/reassigned_issue_email.text.erb +++ b/app/views/notify/reassigned_issue_email.text.erb @@ -1,6 +1,6 @@ Reassigned Issue <%= @issue.iid %> -<%= url_for([@issue.project.namespace.becomes(Namespace), @issue.project, @issue, { only_path: false }]) %> +<%= url_for([@issue.project, @issue, { only_path: false }]) %> Assignee changed <%= "from #{sanitize_name(@previous_assignees.map(&:name).to_sentence)}" if @previous_assignees.any? -%> to <%= "#{@issue.assignees.any? ? @issue.assignee_list : 'Unassigned'}" %> diff --git a/app/views/notify/reassigned_merge_request_email.text.erb b/app/views/notify/reassigned_merge_request_email.text.erb index 82ec7aa0fa4..2b51f48db3a 100644 --- a/app/views/notify/reassigned_merge_request_email.text.erb +++ b/app/views/notify/reassigned_merge_request_email.text.erb @@ -1,6 +1,6 @@ Reassigned Merge Request <%= @merge_request.iid %> -<%= url_for([@merge_request.project.namespace.becomes(Namespace), @merge_request.project, @merge_request, { only_path: false }]) %> +<%= url_for([@merge_request.project, @merge_request, { only_path: false }]) %> Assignee changed <%= "from #{sanitize_name(@previous_assignees.map(&:name).to_sentence)}" if @previous_assignees.any? -%> to <%= "#{@merge_request.assignees.any? ? @merge_request.assignee_list : 'Unassigned'}" %> diff --git a/app/views/notify/service_desk_new_note_email.html.haml b/app/views/notify/service_desk_new_note_email.html.haml index 7c6be6688d0..824b4ab712e 100644 --- a/app/views/notify/service_desk_new_note_email.html.haml +++ b/app/views/notify/service_desk_new_note_email.html.haml @@ -1,5 +1,5 @@ - if Gitlab::CurrentSettings.email_author_in_body %div - #{link_to @note.author_name, user_url(@note.author)} wrote: + = _("%{author_link} wrote:").html_safe % { author_link: link_to(@note.author_name, user_url(@note.author)) } %div = markdown(@note.note, pipeline: :email, author: @note.author) diff --git a/app/views/notify/service_desk_new_note_email.text.erb b/app/views/notify/service_desk_new_note_email.text.erb index 208953a437d..79144fc1bf4 100644 --- a/app/views/notify/service_desk_new_note_email.text.erb +++ b/app/views/notify/service_desk_new_note_email.text.erb @@ -1,6 +1,6 @@ -New response for issue #<%= @issue.iid %>: +<%= _("New response for issue #%{issue_iid}:") % { issue_iid: @issue.iid } %> -Author: <%= sanitize_name(@note.author_name) %> +<%= _("Author: %{author_name}") % { author_name: sanitize_name(@note.author_name) } %> <%= @note.note %> <%# EE-specific start %><%= render_if_exists 'layouts/mailer/additional_text'%><%# EE-specific end %> diff --git a/app/views/notify/service_desk_thank_you_email.html.haml b/app/views/notify/service_desk_thank_you_email.html.haml index a3407acd9ba..ee61db40f07 100644 --- a/app/views/notify/service_desk_thank_you_email.html.haml +++ b/app/views/notify/service_desk_thank_you_email.html.haml @@ -1,2 +1,2 @@ %p - Thank you for your support request! We are tracking your request as ticket ##{@issue.iid}, and will respond as soon as we can. + = _("Thank you for your support request! We are tracking your request as ticket #%{issue_iid}, and will respond as soon as we can.") % { issue_iid: @issue.iid } diff --git a/app/views/notify/service_desk_thank_you_email.text.erb b/app/views/notify/service_desk_thank_you_email.text.erb index 8281607a4a8..8b52219c83b 100644 --- a/app/views/notify/service_desk_thank_you_email.text.erb +++ b/app/views/notify/service_desk_thank_you_email.text.erb @@ -1,6 +1,6 @@ -Thank you for your support request! We are tracking your request as ticket #<%= @issue.iid %>, and will respond as soon as we can. +<%= _("Thank you for your support request! We are tracking your request as ticket #%{issue_iid}, and will respond as soon as we can.") % { issue_iid: @issue.iid } %> -To unsubscribe from this issue, please paste the following link into your browser: +<%= _("To unsubscribe from this issue, please paste the following link into your browser:") %> <%= @unsubscribe_url %> <%# EE-specific start %><%= render_if_exists 'layouts/mailer/additional_text' %><%# EE-specific end %> |