GitLab wurde aktualisiert. Dank regelmäßiger Updates bleibt das THM GitLab sicher und Sie profitieren von den neuesten Funktionen. Vielen Dank für Ihre Geduld.

Commit 24790d3b authored by Kushal Pandya's avatar Kushal Pandya
Browse files

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

Externalize strings from `/app/views/invites`

See merge request gitlab-org/gitlab-ce!23205
parents 75734c46 776b5439
- page_title "Invitation" - page_title _("Invitation")
%h3.page-title Invitation %h3.page-title= _("Invitation")
%p %p
You have been invited You have been invited
...@@ -24,14 +24,17 @@ ...@@ -24,14 +24,17 @@
- if is_member - if is_member
%p %p
However, you are already a member of this #{@member.source.is_a?(Group) ? "group" : "project"}. - member_source = @member.source.is_a?(Group) ? _("group") : _("project")
Sign in using a different account to accept the invitation. = _("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 - if @member.invite_email != current_user.email
%p %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 - unless is_member
.actions .actions
= link_to "Accept invitation", accept_invite_url(@token), method: :post, class: "btn btn-success" = 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 _("Decline"), decline_invite_url(@token), method: :post, class: "btn btn-danger prepend-left-10"
---
title: Externalize strings from `/app/views/invites`
merge_request: 23205
author: Tao Wang
type: other
...@@ -303,6 +303,9 @@ msgstr "" ...@@ -303,6 +303,9 @@ msgstr ""
msgid "Abuse reports" msgid "Abuse reports"
msgstr "" msgstr ""
msgid "Accept invitation"
msgstr ""
msgid "Accept terms" msgid "Accept terms"
msgstr "" msgstr ""
...@@ -2262,6 +2265,9 @@ msgstr "" ...@@ -2262,6 +2265,9 @@ msgstr ""
msgid "December" msgid "December"
msgstr "" msgstr ""
msgid "Decline"
msgstr ""
msgid "Decline and sign out" msgid "Decline and sign out"
msgstr "" msgstr ""
...@@ -3373,6 +3379,9 @@ msgstr "" ...@@ -3373,6 +3379,9 @@ msgstr ""
msgid "Housekeeping successfully started" msgid "Housekeeping successfully started"
msgstr "" 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}" msgid "I accept the %{terms_link}"
msgstr "" msgstr ""
...@@ -3574,6 +3583,9 @@ msgstr "" ...@@ -3574,6 +3583,9 @@ msgstr ""
msgid "Introducing Cycle Analytics" msgid "Introducing Cycle Analytics"
msgstr "" msgstr ""
msgid "Invitation"
msgstr ""
msgid "Invite" msgid "Invite"
msgstr "" msgstr ""
...@@ -4381,6 +4393,9 @@ msgstr "" ...@@ -4381,6 +4393,9 @@ msgstr ""
msgid "Note that the master branch is automatically protected. %{link_to_protected_branches}" msgid "Note that the master branch is automatically protected. %{link_to_protected_branches}"
msgstr "" 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." 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 "" msgstr ""
...@@ -7648,6 +7663,9 @@ msgstr "" ...@@ -7648,6 +7663,9 @@ msgstr ""
msgid "from" msgid "from"
msgstr "" msgstr ""
msgid "group"
msgstr ""
msgid "here" msgid "here"
msgstr "" msgstr ""
...@@ -7894,6 +7912,9 @@ msgstr "" ...@@ -7894,6 +7912,9 @@ msgstr ""
msgid "personal access token" msgid "personal access token"
msgstr "" msgstr ""
msgid "project"
msgstr ""
msgid "remaining" msgid "remaining"
msgstr "" msgstr ""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment