From 8c00874825e66c1db9a682a0844f5cc568e43320 Mon Sep 17 00:00:00 2001 From: Amol Ghatol Date: Thu, 1 Mar 2018 15:45:55 +0530 Subject: [PATCH 1/2] Issue #28 chore:Change the link exp time to hour --- .../artifacts/sunbird/email/messages/messages_en.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keycloak/scripts/ansible/artifacts/sunbird/email/messages/messages_en.properties b/keycloak/scripts/ansible/artifacts/sunbird/email/messages/messages_en.properties index 8a0ae92b..488a58af 100644 --- a/keycloak/scripts/ansible/artifacts/sunbird/email/messages/messages_en.properties +++ b/keycloak/scripts/ansible/artifacts/sunbird/email/messages/messages_en.properties @@ -9,7 +9,7 @@ identityProviderLinkBody=Someone wants to link your "{1}" account with "{0}" acc identityProviderLinkBodyHtml=

Someone wants to link your {1} account with {0} account of user {2} . If this was you, click the link below to link accounts

Link to confirm account linking

This link will expire within {4} minutes.

If you don''t want to link account, just ignore this message. If you link accounts, you will be able to login to {1} through {0}.

passwordResetSubject=Reset password passwordResetBody=Someone just requested to change your {2} account''s credentials. If this was you, click on the link below to reset them.\n\n{0}\n\nThis link and code will expire within {1} minutes.\n\nIf you don''t want to reset your credentials, just ignore this message and nothing will be changed. -passwordResetBodyHtml=

Someone just requested to change your {2} account''s credentials. If this was you, click on the link below to reset them.

Link to reset credentials

This link will expire within {1} minutes.

If you don''t want to reset your credentials, just ignore this message and nothing will be changed.

+passwordResetBodyHtml=

Someone just requested to change your {2} account''s credentials. If this was you, click on the link below to reset them.

Link to reset credentials

This link will expire within {1} hours.

If you don''t want to reset your credentials, just ignore this message and nothing will be changed.

executeActionsSubject=Update Your Account executeActionsBody=Your administrator has just requested that you update your {2} account. Click on the link below to start this process.\n\n{0}\n\nThis link will expire within {1} minutes.\n\nIf you are unaware that your admin has requested this, just ignore this message and nothing will be changed. executeActionsBodyHtml=

Your administrator has just requested that you update your {2} account. Click on the link below to start this process.

Link to account update

This link will expire within {1} minutes.

If you are unaware that your admin has requested this, just ignore this message and nothing will be changed.

From 6acbf3b93e51d60dd29e5069b0b18104c94e6892 Mon Sep 17 00:00:00 2001 From: Amol Ghatol Date: Thu, 22 Mar 2018 15:51:39 +0530 Subject: [PATCH 2/2] Issue SB-1306 fix: corrected username field label --- .../artifacts/sunbird/login/messages/messages_en.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keycloak/scripts/ansible/artifacts/sunbird/login/messages/messages_en.properties b/keycloak/scripts/ansible/artifacts/sunbird/login/messages/messages_en.properties index eb94682c..21226b4f 100644 --- a/keycloak/scripts/ansible/artifacts/sunbird/login/messages/messages_en.properties +++ b/keycloak/scripts/ansible/artifacts/sunbird/login/messages/messages_en.properties @@ -44,8 +44,8 @@ recaptchaNotConfigured=Recaptcha is required, but not configured consentDenied=Consent denied. noAccount=New user? -username=Username or phone -usernameOrEmailOrPhone=Username or email or phone number +username=Username or Phone +usernameOrEmailOrPhone=Username, Email or Phone firstName=First name givenName=Given name fullName=Full name