diff options
author | George Tsiolis <tsiolis.g@gmail.com> | 2018-11-19 22:33:14 +0200 |
---|---|---|
committer | George Tsiolis <tsiolis.g@gmail.com> | 2018-11-27 23:01:55 +0200 |
commit | 776b5439a179560d9ff74312a509804c20b01ccd (patch) | |
tree | 6185396a9e327d6325137abed42b7bb69c536cd6 | |
parent | 1524a19302cea096ddf2c008abe1307527ae6938 (diff) | |
download | gitlab-ce-776b5439a179560d9ff74312a509804c20b01ccd.tar.gz |
Externalize strings from `/app/views/invites`
-rw-r--r-- | app/views/invites/show.html.haml | 17 | ||||
-rw-r--r-- | changelogs/unreleased/gt-externalize-app-views-invites.yml | 5 | ||||
-rw-r--r-- | locale/gitlab.pot | 21 |
3 files changed, 36 insertions, 7 deletions
diff --git a/app/views/invites/show.html.haml b/app/views/invites/show.html.haml index c2bb1216c5f..30ab5781014 100644 --- a/app/views/invites/show.html.haml +++ b/app/views/invites/show.html.haml @@ -1,5 +1,5 @@ -- 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" diff --git a/changelogs/unreleased/gt-externalize-app-views-invites.yml b/changelogs/unreleased/gt-externalize-app-views-invites.yml new file mode 100644 index 00000000000..b5a22177f9b --- /dev/null +++ b/changelogs/unreleased/gt-externalize-app-views-invites.yml @@ -0,0 +1,5 @@ +--- +title: Externalize strings from `/app/views/invites` +merge_request: 23205 +author: Tao Wang +type: other diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 172a0dc5e91..5e4b2940336 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -300,6 +300,9 @@ msgstr "" msgid "Abuse reports" msgstr "" +msgid "Accept invitation" +msgstr "" + msgid "Accept terms" msgstr "" @@ -2253,6 +2256,9 @@ msgstr "" msgid "December" msgstr "" +msgid "Decline" +msgstr "" + msgid "Decline and sign out" msgstr "" @@ -3358,6 +3364,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 "" @@ -3550,6 +3559,9 @@ msgstr "" msgid "Introducing Cycle Analytics" msgstr "" +msgid "Invitation" +msgstr "" + msgid "Invite" msgstr "" @@ -4342,6 +4354,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 "" @@ -7589,6 +7604,9 @@ msgstr "" msgid "from" msgstr "" +msgid "group" +msgstr "" + msgid "here" msgstr "" @@ -7835,6 +7853,9 @@ msgstr "" msgid "personal access token" msgstr "" +msgid "project" +msgstr "" + msgid "remaining" msgstr "" |