Commit 1bef559d authored by antonyliu's avatar antonyliu

Merge remote-tracking branch 'origin/i18n-password-of-user-profile' into...

Merge remote-tracking branch 'origin/i18n-password-of-user-profile' into i18n-password-of-user-profile
parents 2e8c592e dea58cb8
......@@ -14,17 +14,17 @@
- unless @user.password_automatically_set?
.form-group.row
.col-sm-2.col-form-label
= f.label :current_password
= f.label :current_password, _('Current password')
.col-sm-10
= f.password_field :current_password, required: true, class: 'form-control'
.form-group.row
.col-sm-2.col-form-label
= f.label :password
= f.label :password, _('New Password')
.col-sm-10
= f.password_field :password, required: true, class: 'form-control'
.form-group.row
.col-sm-2.col-form-label
= f.label :password_confirmation
= f.label :password_confirmation, _('Password confirmation')
.col-sm-10
= f.password_field :password_confirmation, required: true, class: 'form-control'
.form-actions
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment