summaryrefslogtreecommitdiff
path: root/app/views/shared/_no_password.html.haml
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2017-06-08 10:15:27 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2017-06-08 10:15:27 -0500
commitb55bd9ef95734a6805b11a8a8322149e885425a6 (patch)
tree769f52169d7ad85d68aea3218c7e9116f9269b25 /app/views/shared/_no_password.html.haml
parentc24b70682448f23d7eb01853026cfe6abdf86190 (diff)
parentb4972c4b237ad270ad1a4054c2fe2439d60ee06d (diff)
downloadgitlab-ce-b55bd9ef95734a6805b11a8a8322149e885425a6.tar.gz
Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-ui
Diffstat (limited to 'app/views/shared/_no_password.html.haml')
-rw-r--r--app/views/shared/_no_password.html.haml8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/views/shared/_no_password.html.haml b/app/views/shared/_no_password.html.haml
index ed6fc76c61e..b561e6dc248 100644
--- a/app/views/shared/_no_password.html.haml
+++ b/app/views/shared/_no_password.html.haml
@@ -1,8 +1,10 @@
- if cookies[:hide_no_password_message].blank? && !current_user.hide_no_password && current_user.require_password?
.no-password-message.alert.alert-warning
- You won't be able to pull or push project code via #{gitlab_config.protocol.upcase} until you #{link_to 'set a password', edit_profile_password_path} on your account
+ - set_password_link = link_to s_('SetPasswordToCloneLink|set a password'), edit_profile_password_path
+ - translation_params = { protocol: gitlab_config.protocol.upcase, set_password_link: set_password_link }
+ - set_password_message = _("You won't be able to pull or push project code via %{protocol} until you %{set_password_link} on your account") % translation_params
.alert-link-group
- = link_to "Don't show again", profile_path(user: {hide_no_password: true}), method: :put
+ = link_to _("Don't show again"), profile_path(user: {hide_no_password: true}), method: :put
|
- = link_to 'Remind later', '#', class: 'hide-no-password-message'
+ = link_to _('Remind later'), '#', class: 'hide-no-password-message'