Update email notification templates

- Add "Group Admin Notification for {0} prefix to subjects for email sent to group admins
- Fix typos

src/main/resources/theme/rciam-group/email/messages/messages_en.properties

@@ -1,39 +1,39 @@
-addRemoveGroupAdminBody= You have been {0} a group administrator by {1} for the {2} group.\n{3}\n\nThank you,\n{4}
-addRemoveGroupAdminBodyHtml= <b>You have been {0} a group administrator by {1}</b> for the {2} group.<p>{3}</p><p>Thank you,<br>{4}</p>
+addRemoveGroupAdminBody= You have been {0} a group administrator by {1} for the {2} group.\n\n{3}\n\nThank you,\n{4}
+addRemoveGroupAdminBodyHtml= <p>You have been {0} a group administrator by {1} for the <strong>{2}</strong> group.<p>{3}</p><p>Thank you,<br/>{4}</p>
 addGroupAdminSubject= Notification for Becoming a Group Administrator for {0}
 removeGroupAdminSubject= Notification of Removal from Group Administrators for {0}
 suspendMemberBody= Dear {0},\n\nYour membership in {1} group {2} has been suspended.{3}\n\nIf you have questions or believe this was done in error, please reach out.\n\nThank you,\n{4}
 suspendMemberBodyHtml= <p>Dear {0},</p><p>Your membership in {1} group {2} has been suspended.{3}If you have questions or believe this was done in error, please reach out.</p><p>Thank you,<br>{4}</p>
 suspendMemberSubject= Membership suspension in group {0}
 suspendMemberGroupAdminsBody=Dear {0},\n\n This is to inform you that {1} has been suspended from membership in {2} group {3}.\n\nThe suspension was issued by group administrator {4} {5}\n\n.Thank you,\n{6}
 suspendMemberGroupAdminsBodyHtml=<p>Dear {0},</p><p>This is to inform you that <b>{1}</b> has been suspended from membership in <b>{2}</b> group {3}<br> The suspension was issued by group administrator <b>{4}</b> {5}.</p><p>Thank you,<br>{6}</p>
-suspendMemberGroupAdminsSubject= Membership suspension in group {0}
+suspendMemberGroupAdminsSubject= Group Admin Notification for {0}: Member Suspended
 activateMemberBody=Dear {0},\n\n This is to inform you that your membership has been reactivated in {1} group {2}.\n{3}\n.Thank you,\n{4}
 activateMemberBodyHtml=<p>Dear {0},</p><p>This is to inform you that your membership has been reactivated in <b>{1}</b> group {2}<br> {3}.</p><p>Thank you,<br>{4}</p>
 activateMemberSubject= Group member reactivation
 activateMemberGroupAdminsBody=Dear {0},\n\n This is to inform you that {1} has been reactivated as a member of the {2} group {3}.\n\nThe reactivation was issued by group administrator {4} {5}\n\n.Thank you,\n{6}
 activateMemberGroupAdminsBodyHtml=<p>Dear {0},</p><p>This is to inform you that {1} has been reactivated as a member of the <b>{2}</b> group {3}</p><p> The reactivation was issued by group administrator <b>{4}</b> {5}.</p><p>Thank you,<br>{6}</p>
-activateMemberGroupAdminsSubject= Group member reactivation
+activateMemberGroupAdminsSubject= Group Admin Notification for {0}: Member Reactivated
 inviteGroupAdminSubject= Invitation to become administrator of group {0}
 inviteGroupAdminBody=You have been invited by {0} to become group administrator of the {1} group.\n{2}\nThe group path is {3}\nPlease follow the following link: {4}\n\nPlease note that this invitation will expire after {5} hours.\n\nThank you,\n{6}
-inviteGroupAdminBodyHtml=<p>You have been invited by <strong>{0}</strong> to become group administrator of the <strong>{1}</strong> group.</p><h4>{2}</h4><p>The group path is <strong>{3}</strong></p><a href="{4}" style="border-radius: 4px;color: white;background-color: #0077c8;text-decoration: none;display: inline-block;margin: 0;cursor:pointer;padding: 10px 10px;font-size: 20px;max-width: 150px;max-height: 30px">Become group admin</a><p>You can also click the following link: <a href="{5}">{6}</a> </p><p>Please note that this invitation will expire after {7} hours.</p><p>Thank you,<br>{8}</p>
+inviteGroupAdminBodyHtml=<p>You have been invited by {0} to become group administrator of the <strong>{1}</strong> group.</p><h4>{2}</h4><p>The group path is <strong>{3}</strong></p><a href="{4}" style="border-radius: 4px;color: white;background-color: #0077c8;text-decoration: none;display: inline-block;margin: 0;cursor:pointer;padding: 10px 10px;font-size: 20px;max-width: 150px;max-height: 30px">Become group admin</a><p>You can also click the following link: <a href="{5}">{6}</a> </p><p>Please note that this invitation will expire after {7} hours.</p><p>Thank you,<br>{8}</p>
 acceptRejectEnrollmentBody=Dear {0},\n\n Your request for joining to {1} group has been {2}.\n\n {3}.\n\nThank you,\n{4}
 acceptRejectEnrollmentBodyHtml=<p>Dear {0},</p><p>Your request for joining <b>{1}</b> group has been <b>{2}</b>.<br><br> {3}</p><p>Thank you,<br>{4}</p>
-acceptEnrollmentSubject= Your request for joining {0} group has been accepted
-rejectEnrollmentSubject= Your request for joining {0} group has been rejected
+acceptEnrollmentSubject= Your Request for Joining {0} Group has been Accepted – Welcome!
+rejectEnrollmentSubject= Your Request for Joining {0} Group has been Rejected
 acceptRejectEnrollmentAdminInfoBody=Dear {0},\n\n This is to inform you that {1} has {2} the enrollment request submitted by {3} to join the {4} group.\n\n {5}\n\nFor more information about the group, please visit the following link: \n{6}\n\nThank you,\n{7}
 acceptRejectEnrollmentAdminInfoBodyHtml=<p>Dear {0},</p><p>This is to inform you that <b>{1}</b> has {2} the enrollment request submitted by {3} to join the <b>{4}</b> group.<br><br> {5}</p><p>For more information about the group, please visit the following link: <br>{6}</p><p>Thank you,<br>{7}</p>
-acceptEnrollmentAdminInfoSubject= Request for joining {0} group has been accepted
-rejectEnrollmentAdminInfoSubject= Request for joining {0} group has been rejected
+acceptEnrollmentAdminInfoSubject= Group Admin Notification for {0}: Enrollment Request Accepted
+rejectEnrollmentAdminInfoSubject= Group Admin Notification for {0}: Enrollment Request Rejected
 groupadminEnrollmentRequestCreationBody=Dear {0},\n\n {1} has requested to join the {2} group with the following roles:\n{3}\n{4}\nPlease visit the following link in order to view and process the enrollment request:\n{5}\n\nThank you,\n{6}
 groupadminEnrollmentRequestCreationBodyHtml=<p>Dear {0},</p><p>{1} has requested to join the {2} group with the following roles:<br>{3}<br>{4}</p><p>Please visit the following link in order to view and process the enrollment request:<br>{5}</p><p>Thank you,<br>{6}</p>
-groupadminEnrollmentRequestCreationSubject= New enrollment request for {0} group
+groupadminEnrollmentRequestCreationSubject= Group Admin Notification for {0}: New Enrollment Request
 groupInvitationBody=You have been invited by {0} to join the {1} group.\n{2}\n{3}\nThe group path is {4}\nPlease follow the following link: {5}\n\nPlease note that this invitation will {6}.\n\nThank you,\n{7}
-groupInvitationBodyHtml=<p>You have been invited by <strong>{0}</strong> to join the <strong>{1}</strong> group.</p><h4>{2}</h4><p>{3}<br><br>The group path is <strong>{4}</strong></p><a href="{5}" style="border-radius: 4px;color: white;background-color: #0077c8;text-decoration: none;display: inline-block;margin: 0;cursor:pointer;padding: 10px 10px;font-size: 20px;max-width: 150px;max-height: 30px">Join this group</a><p>You can also click the following link: <a href="{6}">{7}</a> </p><p>Please note that this invitation will {8}.</p><p>Thank you,<br>{9}</p>
+groupInvitationBodyHtml=<p>You have been invited by {0} to join the <strong>{1}</strong> group.</p><h4>{2}</h4><p>{3}<br><br>The group path is <strong>{4}</strong></p><a href="{5}" style="border-radius: 4px;color: white;background-color: #0077c8;text-decoration: none;display: inline-block;margin: 0;cursor:pointer;padding: 10px 10px;font-size: 20px;max-width: 150px;max-height: 30px">Join this group</a><p>You can also click the following link:<br/> <a href="{6}">{7}</a> </p><p>Please note that this invitation will {8}.</p><p>Thank you,<br>{9}</p>
 groupInvitationSubject= Invitation to join group {0}
 groupInvitationAdminInformBody=Dear {0},\n\n User with email {1} has been invited by {2} to become {3} of the group {4}.\n\nThank you,\n{5}
 groupInvitationAdminInformBodyHtml=<p>Dear {0},</p><p> User with email {1} has been invited by {2} to become {3} of the group {4}.</p><p>Thank you,<br>{5}</p>
-groupInvitationAdminInformSubject= Administrator invitation for group {0}
+groupInvitationAdminInformSubject= Group Admin Notification for {0}: New Admin Invited
 groupAcceptInvitationBody=Dear {0},\n\n {1} with email {2} has accepted an invitation to {3} the {4}.\n\nFor more information about the group, please visit the following link: \n{5}\n\nThank you,\n{6}
 groupAcceptInvitationBodyHtml=<p>Dear {0},</p><p>{1} with email {2} has accepted an invitation to {3} the {4}</p><p>For more information about the group, please visit the following link: <br>{5}</p><p>Thank you,<br>{6}</p>
 groupRejectionInvitationBody=Dear {0},\n\n {1} with email {2} has rejected an invitation to {3} the {4}.\n\nFor more information about the group, please visit the following link:\n {5}\n\nThank you,\n{6}
@@ -51,26 +51,26 @@ groupMembershipExpirationNotificationBodyHtml=<p>Dear {0},</p><p>Your membership
 groupMembershipExpirationNotificationSubject= Membership expiration warning for group {0}
 addRemoveGroupAdminAdminInformationBody= This is to inform you that {0} has been {1} by {2} {3} an administrator for the {4} group.\nFor more information about the group, please visit the following link:\n {5}\n\nThank you,\n{6}
 addRemoveGroupAdminAdminInformationBodyHtml= This is to inform you that <b>{0} has been {1} by {2} {3} an administrator</b> for the {4} group.<p>For more information about the group, please visit the following link: <br>{5}</p><p>Thank you,<br>{6}</p>
-addGroupAdminAdminInformationSubject= New Group Administrator Added for  {0}
-removeGroupAdminAdminInformationSubject= Group Administrator Removal for  {0}
-memberUpdateAdminInformSubject= Group Membership Update for {0}
+addGroupAdminAdminInformationSubject= Group Admin Notification for {0}: New Group Admin Added
+removeGroupAdminAdminInformationSubject= Group Admin Notification for {0}: Group Admin Removed
+memberUpdateAdminInformSubject= Group Admin Notification for {0}: Membership Updated
 memberUpdateAdminInformBody=Dear {0},\n\n This is to inform you that {1}, the group administrator, has updated the membership of {2} for the {3} group. The membership details are as follows:\n- Membership Start Date: {4}\n- Membership Expiration Date: {5}\n- Roles: {6}\n\nThank you,\n{7}
 memberUpdateAdminInformBodyHtml=<p>Dear {0},</p><p> This is to inform you that <strong>{1}</strong>, the group administrator, has updated the membership of <strong>{2}</strong> for the <strong>{3}</strong> group. The membership details are as follows:<br>- <strong>Membership Start Date</strong>: {4}<br>- <strong>Membership Expiration Date</strong>: {5}<br>- <strong>Roles</strong>: {6}</p><p>Thank you,<br>{7}</p>
 memberUpdateUserInformSubject= Group Membership Update for {0}
 memberUpdateUserInformBody=Dear {0},\n\n This is to inform you that you have been added as a member by {1} in the {2} group. The membership details are as follows:\n- Membership Start Date: {3}\n- Membership Expiration Date: {4}\n- Roles: {5}\n\nThank you,\n{6}
 memberUpdateUserInformBodyHtml=<p>Dear {0},</p><p> This is to inform you that you have been added as a member by <strong>{1}</strong> in the <strong>{2}</strong> group. The membership details are as follows:<br>- <strong>Membership Start Date</strong>: {3}<br>- <strong>Membership Expiration Date</strong>: {4}<br>- <strong>Roles</strong>: {5}</p><p>Thank you,<br>{6}</p>
-memberCreateAdminInformSubject= New member added to the {0} group
+memberCreateAdminInformSubject= Group Admin Notification for {0}: New Member Added
 memberCreateAdminInformBody=Dear {0},\n\n This is to inform you that {1}, the group administrator, has added {2} as a member of the {3} group.\n\nFor more information about the group, please visit the following link: <br>{4}\n\nThank you,\n{5}
 memberCreateAdminInformBodyHtml=<p>Dear {0},</p><p> This is to inform you that <strong>{1}</strong>, the group administrator, has added <strong>{2}</strong> as a  member of the <strong>{3}</strong> group.<br><br>For more information about the group, please visit the following link: <br>{4}<p>Thank you,<br>{5}</p>
-memberCreateUserInformSubject= Welcome to the {0} group
+memberCreateUserInformSubject= Welcome to the {0} Group
 memberCreateUserInformBody=Dear {0},\n\n This is to inform you that {1} has added you as member of the {2} group.\n\nThe membership details are as follows:\n- Membership Start Date: {3}\n- Membership Expiration Date: {4}\n- Roles: {5}\n\nYou can view and manage your group membership by visiting the following link:\n{6}\n\nThank you,\n{7}
 memberCreateUserInformBodyHtml=<p>Dear {0},</p><p> This is to inform you that <strong>{1}</strong> has added you as member of the <strong>{2}</strong> group.</p><p>The membership details are as follows:<br>- <strong>Membership Start Date</strong>: {3}<br>- <strong>Membership Expiration Date</strong>: {4}<br>- <strong>Roles</strong>: {5}</p><p>You can view and manage your group membership by visiting the following link:<br>{6}</p><p>Thank you,<br>{7}</p>
 deleteGroupAdminInformationBody= =Dear {0},\n\n {1} has deleted group with path {2}.\n\nThank you,\n{3}
 deleteGroupAdminInformationBodyHtml= <p>Dear {0},</p><p>{1} has deleted group with path {2}.</p><p>Thank you,<br>{3}</p>
-deleteGroupAdminInformationSubject= Group deletion
-rolesChangesUserSubject= Your group member roles has been updated
+deleteGroupAdminInformationSubject= Group Admin Notification for {0}: Group Removed
+rolesChangesUserSubject= Your group member roles have been updated
 rolesChangesUserBody=Dear {0},\n\nYour roles in the {1} group has been updated. Your new roles are : {2}\n\nThank you,\n{3}
 rolesChangesUserBodyHtml=<p>Dear {0},</p><p>Your roles in the {1} group has been updated. Your new roles are : {2}</p><p>Thank you,<br>{3}</p>
-rolesChangesGroupAdminSubject= Group member roles has been updated
+rolesChangesGroupAdminSubject= Group Admin Notification for {0}: Roles Updated
 rolesChangesGroupAdminBody=Dear {0},\n\nThis is to inform you that the group administrator,{1}, has updated the roles of member {2} in the {3} group. The new roles assigned are: {4}\n\nThank you,\n{5}
 rolesChangesGroupAdminBodyHtml=<p>Dear {0},</p><p>This is to inform you that the group administrator,<b>{1}</b>, has updated the roles of member {2} in the {3} group. The new roles assigned are: {4}</p><p>Thank you,<br>{5}</p>