Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Show error message if password and confirm password not equal #16247

Merged
merged 4 commits into from
Mar 19, 2020
Merged

[FIX] Show error message if password and confirm password not equal #16247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79b2724
[FIX] Pwd and confirm pwd not equal error message
ashwaniYDV Jan 14, 2020
8d02505
en-i18 fix
ashwaniYDV Jan 14, 2020
00a9c77
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
ashwaniYDV Mar 13, 2020
6fe3f29
updated variable name
ashwaniYDV Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion app/ui-account/client/accountProfile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<div class="rc-input__icon">
{{> icon block="rc-input__icon-svg" icon="edit"}}
</div>

<input type="text" class="rc-input__element" maxlength="120" name="statusText" id="statusText" placeholder="{{_ "StatusMessage_Placeholder" }}" value="{{statusText}}" {{ifThenElse canChange '' 'disabled'}}>
</div>
</label>
Expand Down Expand Up @@ -176,6 +176,14 @@
{{# unless canChange}}
<div class="rc-input__description">{{_ 'Password_Change_Disabled'}}</div>
{{/unless}}
{{#if confirmationPasswordInvalid}}
<div class="rc-input__error">
<div class="rc-input__error-icon">
{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
</div>
<div class="rc-input__error-message">{{_ 'Passwords_do_not_match'}}</div>
</div>
{{/if}}
{{/with}}
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2526,6 +2526,7 @@
"Password_Changed_Email_Subject": "[Site_Name] - Password Changed",
"Password_changed_section": "Password Changed",
"Password_changed_successfully": "Password changed successfully",
"Passwords_do_not_match": "Passwords do not match",
"Password_Policy": "Password Policy",
"Past_Chats": "Past Chats",
"Paste_here": "Paste here...",
Expand Down Expand Up @@ -3620,4 +3621,4 @@
"Your_server_link": "Your server link",
"Your_temporary_password_is_password": "Your temporary password is <strong>[password]</strong>.",
"Your_workspace_is_ready": "Your workspace is ready to use 🎉"
}
}