Skip to content

Commit

Permalink
Merge pull request #9969 from kumarnitj/change-pwd
Browse files Browse the repository at this point in the history
Changed 'confirm password' placeholder text on user registration form
  • Loading branch information
engelgabriel authored Jun 7, 2018
2 parents 449489b + a913a11 commit b4f0383
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
5 changes: 5 additions & 0 deletions packages/rocketchat-lib/server/startup/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ RocketChat.settings.addGroup('Accounts', function() {
'public': true,
i18nLabel: 'Placeholder_for_password_login_field'
});
this.add('Accounts_ConfirmPasswordPlaceholder', '', {
type: 'string',
'public': true,
i18nLabel: 'Placeholder_for_password_login_field'
});
this.add('Accounts_ForgetUserSessionOnWindowClose', false, {
type: 'boolean',
'public': true
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-login/client/login/form.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ <h2 data-i18n="Registration_Succeeded">{{{_ "Registration_Succeeded"}}}</h2>
<div class="rc-input__wrapper">
<input name="confirm-pass" id="confirm-pass" type="password" class="rc-input__element"
autocapitalize="off" autocorrect="off"
placeholder="{{passwordPlaceholder}}" autofocus>
placeholder="{{confirmPasswordPlaceholder}}" autofocus>
<div class="input-error"></div>
</div>
</label>
Expand Down
3 changes: 3 additions & 0 deletions packages/rocketchat-ui-login/client/login/form.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ Template.loginForm.helpers({
passwordPlaceholder() {
return RocketChat.settings.get('Accounts_PasswordPlaceholder') || t('Password');
},
confirmPasswordPlaceholder() {
return RocketChat.settings.get('Accounts_ConfirmPasswordPlaceholder') || t('Confirm_password');
},
hasOnePassword() {
return typeof OnePassword !== 'undefined' && OnePassword.findLoginForUrl && typeof device !== 'undefined' && device.platform && device.platform.toLocaleLowerCase() === 'ios';
},
Expand Down

0 comments on commit b4f0383

Please sign in to comment.