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

Jump to bottom

[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

merged 4 commits into from
Mar 19, 2020

Conversation

ashwaniYDV
Copy link
Contributor

@ashwaniYDV ashwaniYDV commented Jan 14, 2020 •
edited
Loading

Closes #16246

Before changes:

asasasasa

After changes:

pwdconfpwd

@gabriellsh gabriellsh added this to the 3.0.0 milestone Jan 27, 2020
gabriellsh
gabriellsh previously approved these changes Jan 27, 2020
View reviewed changes
Copy link
Member

@gabriellsh gabriellsh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me! Thanks for your help.

sampaiodiego
sampaiodiego requested changes Mar 12, 2020
View reviewed changes
Copy link
Member

@sampaiodiego sampaiodiego left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please try to keep i18n keys as close as possible to its value so they can easily be used multiple times.

app/ui-account/client/accountProfile.html Outdated
<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">{{_ 'Password_Confirmpassword_Mismatch'}}</div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<div class="rc-input__error-message">{{_ 'Password_Confirmpassword_Mismatch'}}</div>
<div class="rc-input__error-message">{{_ "Passwords_do_not_match"}}</div>

packages/rocketchat-i18n/i18n/en.i18n.json Outdated
@@ -2461,6 +2461,7 @@
"Password_Changed_Email_Subject": "[Site_Name] - Password Changed",
"Password_changed_section": "Password Changed",
"Password_changed_successfully": "Password changed successfully",
"Password_Confirmpassword_Mismatch": "Passwords do not match",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"Password_Confirmpassword_Mismatch": "Passwords do not match",
"Passwords_do_not_match": "Passwords do not match",

@CLAassistant
Copy link

CLA assistant check
All committers have signed the CLA.

@ashwaniYDV
Copy link
Contributor Author

hi @sampaiodiego I have done the requested changes

@engelgabriel engelgabriel modified the milestones: 3.0.0, 3.1.0 Mar 17, 2020
@ggazzo ggazzo merged commit 77472fd into RocketChat:develop Mar 19, 2020
@ggazzo ggazzo changed the title [FIX] Pwd and confirm pwd not equal error message [FIX] Show error message if password and confirm password not equal Mar 19, 2020
ggazzo added a commit to wreiske/Rocket.Chat that referenced this pull request Mar 19, 2020
@ggazzo
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into pr/1…
1c9b519 
…4892-wreiske-user-status-bubbles

* 'develop' of github.com:RocketChat/Rocket.Chat: (540 commits)
  [FIX] Show error message if password and confirm password not equal (RocketChat#16247)
  [FIX] Message quote button inside threads (RocketChat#16925)
  Fix wrong imported library meteor/tap:i18n
  lint
  [IMPROVE] User gets feedback when a message has been starred or unstarred (RocketChat#13860)
  [FIX] admin can sort users by email in directory view (RocketChat#15796)
  [FIX] Pinned messages wouldn't collapse (RocketChat#16188)
  [IMPROVE] Added border to page header. (RocketChat#16792)
  [FIX] Correct thread messages display in context bar. (RocketChat#16835)
  [FIX] Public channel cannot be acessed via URL when 'Allow Anonymous Read' is active (RocketChat#16914)
  Fixed Line break incorrectly being called apostrophe (RocketChat#16918)
  [IMPROVE] Context menu autofocus (RocketChat#16915)
  Improve room types usage (RocketChat#16753)
  [NEW] API `users.deactivateIdle` for mass-disabling of idle users (RocketChat#16849)
  [NEW] API to logout from other locations (RocketChat#16193)
  [IMPROVE] Add option to require authentication on user's shield endpoint (RocketChat#16845)
  [FIX] Custom OAuth Bug (RocketChat#16811)
  [FIX] Integrations page pagination (RocketChat#16838)
  reset package-lock to upstream
  Apply suggestions from code review
  ...
ggazzo added a commit that referenced this pull request Mar 20, 2020
@ggazzo
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into dm/m…
9d52ff9 
…ultiple-users* 'develop' of github.com:RocketChat/Rocket.Chat: (53 commits) [FIX] Show error message if password and confirm password not equal (#16247)  [FIX] Message quote button inside threads (#16925)  Fix wrong imported library meteor/tap:i18n  lint  [IMPROVE] User gets feedback when a message has been starred or unstarred (#13860)  [FIX] admin can sort users by email in directory view (#15796)  [FIX] Pinned messages wouldn't collapse (#16188)  [IMPROVE] Added border to page header. (#16792)  [FIX] Correct thread messages display in context bar. (#16835)  [FIX] Public channel cannot be acessed via URL when 'Allow Anonymous Read' is active (#16914)  Fixed Line break incorrectly being called apostrophe (#16918)  [IMPROVE] Context menu autofocus (#16915)  Improve room types usage (#16753)  [NEW] API `users.deactivateIdle` for mass-disabling of idle users (#16849)  [NEW] API to logout from other locations (#16193)  [IMPROVE] Add option to require authentication on user's shield endpoint (#16845)  [FIX] Custom OAuth Bug (#16811)  [FIX] Integrations page pagination (#16838)  reset package-lock to upstream  Apply suggestions from code review  ...
@sampaiodiego sampaiodiego mentioned this pull request Apr 9, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sampaiodiego sampaiodiego sampaiodiego requested changes

@ggazzo ggazzo ggazzo approved these changes

@gabriellsh gabriellsh gabriellsh left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.1.0
Development

Successfully merging this pull request may close these issues.

No error message of password and conf-password mismatch
6 participants
@ashwaniYDV @CLAassistant @ggazzo @sampaiodiego @gabriellsh @engelgabriel