From 724a8d61135993b624fa8e1a8efb3c98eb40f3d9 Mon Sep 17 00:00:00 2001 From: June Kelly Date: Tue, 25 Apr 2023 13:33:12 +0100 Subject: [PATCH] Merge pull request #12698 from overleaf/jk-full-stops [web] Add full-stops after 'Please use a different password' GitOrigin-RevId: 9cac7c70358db11a74858252001a2dee211c0325 --- services/web/app/views/user/setPassword.pug | 6 +++--- .../js/features/settings/components/password-section.tsx | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/web/app/views/user/setPassword.pug b/services/web/app/views/user/setPassword.pug index 469c681386..dfa47ebe2e 100644 --- a/services/web/app/views/user/setPassword.pug +++ b/services/web/app/views/user/setPassword.pug @@ -26,11 +26,11 @@ block content +customFormMessage('password-contains-email', 'danger') | #{translate('invalid_password_contains_email')}. - | #{translate('use_a_different_password')} + | #{translate('use_a_different_password')}. +customFormMessage('password-too-similar', 'danger') | #{translate('invalid_password_too_similar')}. - | #{translate('use_a_different_password')} + | #{translate('use_a_different_password')}. +customFormMessage('token-expired', 'danger') | #{translate('password_reset_token_expired')} @@ -54,7 +54,7 @@ block content ) +customValidationMessage('invalid-password') - | #{translate('invalid_password')} + | #{translate('invalid_password')}. +customValidationMessage('password-must-be-different') | #{translate('password_cant_be_the_same_as_current_one')}. diff --git a/services/web/frontend/js/features/settings/components/password-section.tsx b/services/web/frontend/js/features/settings/components/password-section.tsx index a2ad1740a1..59427088b2 100644 --- a/services/web/frontend/js/features/settings/components/password-section.tsx +++ b/services/web/frontend/js/features/settings/components/password-section.tsx @@ -162,17 +162,17 @@ function PasswordForm() { />, ]} /> - . {t('use_a_different_password')} + . {t('use_a_different_password')}. ) : getErrorMessageKey(error) === 'password-contains-email' ? ( <> {t('invalid_password_contains_email')}.{' '} - {t('use_a_different_password')} + {t('use_a_different_password')}. ) : getErrorMessageKey(error) === 'password-too-similar' ? ( <> {t('invalid_password_too_similar')}.{' '} - {t('use_a_different_password')} + {t('use_a_different_password')}. ) : ( getUserFacingMessage(error)