diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-20 12:08:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-20 12:08:54 +0000 |
commit | be2142bf5e03af8ba9bb96e4bf0b4781184ae01b (patch) | |
tree | b40aab281b29a56bd398757564d271c8b3aa8662 /app/views/notify/member_invited_email.html.haml | |
parent | bc12365ae0254332f97299138f019bea3ff12351 (diff) | |
download | gitlab-ce-be2142bf5e03af8ba9bb96e4bf0b4781184ae01b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify/member_invited_email.html.haml')
-rw-r--r-- | app/views/notify/member_invited_email.html.haml | 20 |
1 files changed, 8 insertions, 12 deletions
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' |