diff options
| author | antonyliu <sun_apollo@yeah.net> | 2019-05-29 12:36:33 +0800 |
|---|---|---|
| committer | antonyliu <sun_apollo@yeah.net> | 2019-05-29 12:36:33 +0800 |
| commit | dea58cb8651d510fd4a75b2ac084552fa3d81946 (patch) | |
| tree | 4a0ee13e0af5d33dd3af1f1c0528fd5ae46f0302 | |
| parent | abd456caae3f18d4c79419f5dc8410c5c925fb66 (diff) | |
| download | gitlab-ce-dea58cb8651d510fd4a75b2ac084552fa3d81946.tar.gz | |
Apply suggestion to app/views/profiles/passwords/edit.html.haml
Apply @reprazent suggestion. See gitlab-org/gitlab-ee!13339
| -rw-r--r-- | app/views/profiles/passwords/edit.html.haml | 7 | ||||
| -rw-r--r-- | locale/gitlab.pot | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml index 9f4f0ac2019..031f0524094 100644 --- a/app/views/profiles/passwords/edit.html.haml +++ b/app/views/profiles/passwords/edit.html.haml @@ -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.') .col-lg-8 %h5.prepend-top-0 - = _('Change your password') - - unless @user.password_automatically_set? - = _('or recover your current one') + - if @user.password_automatically set + = _('Change your password') + - 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_errors(@user) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 75bf093ee88..11f19027464 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1776,6 +1776,9 @@ msgstr "" msgid "Change your password" msgstr "" +msgid "Change your password or recover your current one" +msgstr "" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "" @@ -12102,9 +12105,6 @@ msgstr "" msgid "or" msgstr "" -msgid "or recover your current one" -msgstr "" - msgid "out of %d total test" msgid_plural "out of %d total tests" msgstr[0] "" |