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
6e516eb0
Commit
6e516eb0
authored
Jan 15, 2019
by
George Tsiolis
Committed by
Fatih Acet
Jan 15, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Externalize strings from `/app/views/profiles/accounts`
parent
0894114b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
53 additions
and
17 deletions
+53
-17
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+17
-17
locale/gitlab.pot
locale/gitlab.pot
+36
-0
No files found.
app/views/profiles/accounts/show.html.haml
View file @
6e516eb0
-
page_title
"Account"
-
page_title
_
(
'Account'
)
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
if
current_user
.
ldap_user?
.alert.alert-info
Some options are unavailable for LDAP accounts
=
s_
(
'Profiles|Some options are unavailable for LDAP accounts'
)
.row.prepend-top-default
.col-lg-4.profile-settings-sidebar
%h4
.prepend-top-0
Two-Factor Authentication
=
s_
(
"Profiles|Two-Factor Authentication"
)
%p
Increase your account's security by enabling Two-Factor Authentication (2FA).
=
s_
(
"Profiles|Increase your account's security by enabling Two-Factor Authentication (2FA)"
)
.col-lg-8
%p
Status:
#{
current_user
.
two_factor_enabled?
?
'Enabled'
:
'Disabled'
}
#{
_
(
'Status'
)
}
:
#{
current_user
.
two_factor_enabled?
?
_
(
'Enabled'
)
:
_
(
'Disabled'
)
}
-
if
current_user
.
two_factor_enabled?
=
link_to
'Manage two-factor authentication'
,
profile_two_factor_auth_path
,
class:
'btn btn-info'
=
link_to
_
(
"Manage two-factor authentication"
)
,
profile_two_factor_auth_path
,
class:
'btn btn-info'
-
else
.append-bottom-10
=
link_to
'Enable two-factor authentication'
,
profile_two_factor_auth_path
,
class:
'btn btn-success'
=
link_to
_
(
"Enable two-factor authentication"
)
,
profile_two_factor_auth_path
,
class:
'btn btn-success'
%hr
-
if
display_providers_on_profile?
.row.prepend-top-default
.col-lg-4.profile-settings-sidebar
%h4
.prepend-top-0
Social sign-in
=
s_
(
'Profiles|Social sign-in'
)
%p
Activate signin with one of the following services
=
s_
(
'Profiles|Activate signin with one of the following services'
)
.col-lg-8
%label
.label-bold
Connected Accounts
%p
Click on icon to activate signin with one of the following services
=
s_
(
'Profiles|Connected Accounts'
)
%p
=
s_
(
'Profiles|Click on icon to activate signin with one of the following services'
)
-
button_based_providers
.
each
do
|
provider
|
.provider-btn-group
.provider-btn-image
...
...
@@ -39,24 +39,24 @@
-
if
auth_active?
(
provider
)
-
if
unlink_allowed?
(
provider
)
=
link_to
unlink_profile_account_path
(
provider:
provider
),
method: :delete
,
class:
'provider-btn'
do
Disconnect
=
s_
(
'Profiles|Disconnect'
)
-
else
%a
.provider-btn
Active
=
s_
(
'Profiles|Active'
)
-
else
=
link_to
omniauth_authorize_path
(
:user
,
provider
),
method: :post
,
class:
'provider-btn not-active'
do
Connect
=
s_
(
'Profiles|Connect'
)
=
render_if_exists
'profiles/accounts/group_saml_unlink_buttons'
,
group_saml_identities:
local_assigns
[
:group_saml_identities
]
%hr
-
if
current_user
.
can_change_username?
.row.prepend-top-default
.col-lg-4.profile-settings-sidebar
%h4
.prepend-top-0.warning-title
Change username
=
s_
(
'Profiles|Change username'
)
%p
Changing your username can have unintended side effects.
=
s_
(
'Profiles|Changing your username can have unintended side effects.'
)
=
succeed
'.'
do
=
link_to
'Learn more'
,
help_page_path
(
'user/profile/index'
,
anchor:
'changing-your-username'
),
target:
'_blank'
=
link_to
s_
(
'Profiles|Learn more'
)
,
help_page_path
(
'user/profile/index'
,
anchor:
'changing-your-username'
),
target:
'_blank'
.col-lg-8
-
data
=
{
initial_username:
current_user
.
username
,
root_url:
root_url
,
action_url:
update_username_profile_path
(
format: :json
)
}
#update-username
{
data:
data
}
...
...
locale/gitlab.pot
View file @
6e516eb0
...
...
@@ -3308,6 +3308,9 @@ msgstr ""
msgid "Enable the Performance Bar for a given group."
msgstr ""
msgid "Enable two-factor authentication"
msgstr ""
msgid "Enable usage ping"
msgstr ""
...
...
@@ -5491,6 +5494,9 @@ msgstr ""
msgid "Manage project labels"
msgstr ""
msgid "Manage two-factor authentication"
msgstr ""
msgid "Manage your group’s membership while adding another level of security with SAML."
msgstr ""
...
...
@@ -6779,6 +6785,12 @@ msgstr ""
msgid "Profiles|Account scheduled for removal."
msgstr ""
msgid "Profiles|Activate signin with one of the following services"
msgstr ""
msgid "Profiles|Active"
msgstr ""
msgid "Profiles|Add key"
msgstr ""
...
...
@@ -6794,6 +6806,9 @@ msgstr ""
msgid "Profiles|Change username"
msgstr ""
msgid "Profiles|Changing your username can have unintended side effects."
msgstr ""
msgid "Profiles|Choose file..."
msgstr ""
...
...
@@ -6806,6 +6821,15 @@ msgstr ""
msgid "Profiles|Clear status"
msgstr ""
msgid "Profiles|Click on icon to activate signin with one of the following services"
msgstr ""
msgid "Profiles|Connect"
msgstr ""
msgid "Profiles|Connected Accounts"
msgstr ""
msgid "Profiles|Current path: %{path}"
msgstr ""
...
...
@@ -6824,6 +6848,9 @@ msgstr ""
msgid "Profiles|Deleting an account has the following effects:"
msgstr ""
msgid "Profiles|Disconnect"
msgstr ""
msgid "Profiles|Do not show on profile"
msgstr ""
...
...
@@ -6836,6 +6863,9 @@ msgstr ""
msgid "Profiles|Enter your name, so people you know can recognize you"
msgstr ""
msgid "Profiles|Increase your account's security by enabling Two-Factor Authentication (2FA)"
msgstr ""
msgid "Profiles|Invalid password"
msgstr ""
...
...
@@ -6872,6 +6902,9 @@ msgstr ""
msgid "Profiles|Set new profile picture"
msgstr ""
msgid "Profiles|Social sign-in"
msgstr ""
msgid "Profiles|Some options are unavailable for LDAP accounts"
msgstr ""
...
...
@@ -6899,6 +6932,9 @@ msgstr ""
msgid "Profiles|This information will appear on your profile"
msgstr ""
msgid "Profiles|Two-Factor Authentication"
msgstr ""
msgid "Profiles|Type your %{confirmationValue} to confirm:"
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