Merge branch 'gt-externalize-app-views-invites' into 'master'

Externalize strings from `/app/views/invites`

See merge request gitlab-org/gitlab-ce!23205

app/views/invites/show.html.haml

-- page_title "Invitation"
-%h3.page-title Invitation
+- page_title _("Invitation")
+%h3.page-title= _("Invitation")
 %p
   You have been invited
@@ -24,14 +24,17 @@
 - if is_member
   %p
-    However, you are already a member of this #{@member.source.is_a?(Group) ? "group" : "project"}.
-    Sign in using a different account to accept the invitation.
+    - member_source = @member.source.is_a?(Group) ? _("group") : _("project")
+    = _("However, you are already a member of this %{member_source}. Sign in using a different account to accept the invitation.") % { member_source: member_source }
 - if @member.invite_email != current_user.email
   %p
-    Note that this invitation was sent to #{mail_to @member.invite_email}, but you are signed in as #{link_to current_user.to_reference, user_url(current_user)} with email #{mail_to current_user.email}.
+    - mail_to_invite_email = mail_to(@member.invite_email)
+    - mail_to_current_user = mail_to(current_user.email)
+    - link_to_current_user = link_to(current_user.to_reference, user_url(current_user))
+    = _("Note that this invitation was sent to %{mail_to_invite_email}, but you are signed in as %{link_to_current_user} with email %{mail_to_current_user}.").html_safe % { mail_to_invite_email: mail_to_invite_email, mail_to_current_user: mail_to_current_user, link_to_current_user: link_to_current_user }
 - unless is_member
   .actions
-    = link_to "Accept invitation", accept_invite_url(@token), method: :post, class: "btn btn-success"
-    = link_to "Decline", decline_invite_url(@token), method: :post, class: "btn btn-danger prepend-left-10"
+    = link_to _("Accept invitation"), accept_invite_url(@token), method: :post, class: "btn btn-success"
+    = link_to _("Decline"), decline_invite_url(@token), method: :post, class: "btn btn-danger prepend-left-10"

changelogs/unreleased/gt-externalize-app-views-invites.yml

+---
+title: Externalize strings from `/app/views/invites`
+merge_request: 23205
+author: Tao Wang
+type: other

locale/gitlab.pot

@@ -303,6 +303,9 @@ msgstr ""
 msgid "Abuse reports"
 msgstr ""
+msgid "Accept invitation"
+msgstr ""
+
 msgid "Accept terms"
 msgstr ""
@@ -2262,6 +2265,9 @@ msgstr ""
 msgid "December"
 msgstr ""
+msgid "Decline"
+msgstr ""
+
 msgid "Decline and sign out"
 msgstr ""
@@ -3373,6 +3379,9 @@ msgstr ""
 msgid "Housekeeping successfully started"
 msgstr ""
+msgid "However, you are already a member of this %{member_source}. Sign in using a different account to accept the invitation."
+msgstr ""
+
 msgid "I accept the %{terms_link}"
 msgstr ""
@@ -3574,6 +3583,9 @@ msgstr ""
 msgid "Introducing Cycle Analytics"
 msgstr ""
+msgid "Invitation"
+msgstr ""
+
 msgid "Invite"
 msgstr ""
@@ -4381,6 +4393,9 @@ msgstr ""
 msgid "Note that the master branch is automatically protected. %{link_to_protected_branches}"
 msgstr ""
+msgid "Note that this invitation was sent to %{mail_to_invite_email}, but you are signed in as %{link_to_current_user} with email %{mail_to_current_user}."
+msgstr ""
+
 msgid "Note: As an administrator you may like to configure %{github_integration_link}, which will allow login via GitHub and allow importing repositories without generating a Personal Access Token."
 msgstr ""
@@ -7648,6 +7663,9 @@ msgstr ""
 msgid "from"
 msgstr ""
+msgid "group"
+msgstr ""
+
 msgid "here"
 msgstr ""
@@ -7894,6 +7912,9 @@ msgstr ""
 msgid "personal access token"
 msgstr ""
+msgid "project"
+msgstr ""
+
 msgid "remaining"
 msgstr ""