Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a0d9b35b
Commit
a0d9b35b
authored
Apr 12, 2021
by
Marvin Karegyeya
Committed by
Kerri Miller
Apr 12, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Externalize strings in _confirmation_instructions_account.html.haml
parent
45505fbc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
6 deletions
+26
-6
app/views/devise/mailer/_confirmation_instructions_account.html.haml
...evise/mailer/_confirmation_instructions_account.html.haml
+6
-6
changelogs/unreleased/Externalise-strings-in_confirmation_instructions_account-html-haml.yml
...trings-in_confirmation_instructions_account-html-haml.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+15
-0
No files found.
app/views/devise/mailer/_confirmation_instructions_account.html.haml
View file @
a0d9b35b
...
...
@@ -2,15 +2,15 @@
-
if
@resource
.
unconfirmed_email
.
present?
||
!
@resource
.
created_recently?
#content
=
email_default_heading
(
@resource
.
unconfirmed_email
||
@resource
.
email
)
%p
Click the link below to confirm your email address.
%p
=
_
(
'Click the link below to confirm your email address.'
)
#cta
=
link_to
'Confirm your email address'
,
confirmation_link
=
link_to
_
(
'Confirm your email address'
)
,
confirmation_link
-
else
#content
-
if
Gitlab
.
com?
=
email_default_heading
(
'Thanks for signing up to GitLab!'
)
=
email_default_heading
(
_
(
'Thanks for signing up to GitLab!'
)
)
-
else
=
email_default_heading
(
"Welcome,
#{
@resource
.
name
}
!"
)
%p
To get started, click the link below to confirm your account.
=
email_default_heading
(
_
(
"Welcome, %{name}!"
)
%
{
name:
@resource
.
name
}
)
%p
=
_
(
"To get started, click the link below to confirm your account."
)
#cta
=
link_to
'Confirm your account'
,
confirmation_link
=
link_to
_
(
'Confirm your account'
)
,
confirmation_link
changelogs/unreleased/Externalise-strings-in_confirmation_instructions_account-html-haml.yml
0 → 100644
View file @
a0d9b35b
---
title
:
Externalize strings in _confirmation_instructions_account.html.haml
merge_request
:
58214
author
:
nuwe1
type
:
other
locale/gitlab.pot
View file @
a0d9b35b
...
...
@@ -6378,6 +6378,9 @@ msgstr ""
msgid "Click the button below."
msgstr ""
msgid "Click the link below to confirm your email address."
msgstr ""
msgid "Click to expand it."
msgstr ""
...
...
@@ -8153,6 +8156,12 @@ msgstr ""
msgid "Confirm"
msgstr ""
msgid "Confirm your account"
msgstr ""
msgid "Confirm your email address"
msgstr ""
msgid "Confirmation email sent to %{email}"
msgstr ""
...
...
@@ -30615,6 +30624,9 @@ msgstr ""
msgid "Thank you for your support request! We are tracking your request as ticket #%{issue_iid}, and will respond as soon as we can."
msgstr ""
msgid "Thanks for signing up to GitLab!"
msgstr ""
msgid "Thanks for your purchase!"
msgstr ""
...
...
@@ -34904,6 +34916,9 @@ msgstr ""
msgid "Welcome to the guided GitLab tour"
msgstr ""
msgid "Welcome, %{name}!"
msgstr ""
msgid "What are you searching for?"
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment