kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Apply suggestion to app/views/profiles/passwords/edit.html.haml

Browse source 
Apply @reprazent suggestion. See gitlab-org/gitlab-ee!13339
This commit is contained in:
antonyliu 2019-05-29 12:36:33 +08:00
parent 90db261940
commit 2e8c592e23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/views/profiles/passwords/edit.html.haml
View file

@ -10,9 +10,10 @@
= _('After a successful password update, you will be redirected to the login page where you can log in with your new password.') = _('After a successful password update, you will be redirected to the login page where you can log in with your new password.')
.col-lg-8 .col-lg-8
%h5.prepend-top-0 %h5.prepend-top-0
= _('Change your password') - if @user.password_automatically set
- unless @user.password_automatically_set? = _('Change your password')
= _('or recover your current one') - else
= _('Change your password or recover your current one')
= form_for @user, url: profile_password_path, method: :put, html: {class: "update-password"} do |f| = form_for @user, url: profile_password_path, method: :put, html: {class: "update-password"} do |f|
= form_errors(@user) = form_errors(@user)

6
locale/gitlab.pot
View file

@ -1776,6 +1776,9 @@ msgstr ""
msgid "Change your password" msgid "Change your password"
msgstr "" msgstr ""
msgid "Change your password or recover your current one"
msgstr ""
msgid "ChangeTypeActionLabel|Pick into branch" msgid "ChangeTypeActionLabel|Pick into branch"
msgstr "" msgstr ""
@ -12102,9 +12105,6 @@ msgstr ""
msgid "or" msgid "or"
msgstr "" msgstr ""
msgid "or recover your current one"
msgstr ""
msgid "out of %d total test" msgid "out of %d total test"
msgid_plural "out of %d total tests" msgid_plural "out of %d total tests"
msgstr[0] "" msgstr[0] ""