diff --git a/app/scenes/Settings/Notifications.tsx b/app/scenes/Settings/Notifications.tsx index 2a768e7be6..dc1f4185be 100644 --- a/app/scenes/Settings/Notifications.tsx +++ b/app/scenes/Settings/Notifications.tsx @@ -74,7 +74,7 @@ function Notifications() { { event: NotificationEventType.GroupMentionedInDocument, icon: , - title: t("Group Mentions"), + title: t("Group mentions"), description: t( "Receive a notification when someone mentions a group you are a member of in a document or comment" ), diff --git a/server/emails/templates/GroupCommentMentionedEmail.tsx b/server/emails/templates/GroupCommentMentionedEmail.tsx index 5a26dc5458..e6525824cf 100644 --- a/server/emails/templates/GroupCommentMentionedEmail.tsx +++ b/server/emails/templates/GroupCommentMentionedEmail.tsx @@ -99,12 +99,12 @@ export default class GroupCommentMentionedEmail extends BaseEmail< return; } - protected subject({ document }: Props) { - return `Your group was mentioned in “${document.titleWithDefault}”`; + protected subject({ document, groupName }: Props) { + return `The ${groupName} group was mentioned in “${document.titleWithDefault}”`; } protected preview({ actorName, groupName }: Props): string { - return `${actorName} mentioned your group, "${groupName}", in a thread`; + return `${actorName} mentioned the "${groupName}" group in a thread`; } protected fromName({ actorName }: Props): string { @@ -120,7 +120,7 @@ export default class GroupCommentMentionedEmail extends BaseEmail< groupName, }: Props): string { return ` -${actorName} mentioned your group, "${groupName}", in a comment on "${document.titleWithDefault}"${ +${actorName} mentioned the "${groupName}" group in a comment on "${document.titleWithDefault}"${ collection.name ? ` in the ${collection.name} collection` : "" }. @@ -151,7 +151,7 @@ Open Thread: ${teamUrl}${document.url}?commentId=${commentId} {document.titleWithDefault}

- {actorName} mentioned your group, "{groupName}", in a comment on{" "} + {actorName} mentioned the "{groupName}" group in a comment on{" "} {document.titleWithDefault}{" "} {collection.name ? ` in the ${collection.name} collection` : ""}.

diff --git a/server/emails/templates/GroupDocumentMentionedEmail.tsx b/server/emails/templates/GroupDocumentMentionedEmail.tsx index b369236858..19a6813c21 100644 --- a/server/emails/templates/GroupDocumentMentionedEmail.tsx +++ b/server/emails/templates/GroupDocumentMentionedEmail.tsx @@ -97,12 +97,12 @@ export default class GroupDocumentMentionedEmail extends BaseEmail< return { document, body, groupName: group.name }; } - protected subject({ document }: Props) { - return `Your group was mentioned in “${document.titleWithDefault}”`; + protected subject({ document, groupName }: Props) { + return `The ${groupName} group was mentioned in “${document.titleWithDefault}”`; } protected preview({ actorName, groupName }: Props): string { - return `${actorName} mentioned your group, "${groupName}"`; + return `${actorName} mentioned the "${groupName}" group`; } protected fromName({ actorName }: Props) { @@ -125,9 +125,7 @@ export default class GroupDocumentMentionedEmail extends BaseEmail< groupName, }: Props): string { return ` -Your group was mentioned. - -${actorName} mentioned your group, “${groupName}”, in the document “${document.titleWithDefault}”. +${actorName} mentioned the “${groupName}” group in the document “${document.titleWithDefault}”. Open Document: ${teamUrl}${document.url} `; @@ -147,7 +145,7 @@ Open Document: ${teamUrl}${document.url} Your group was mentioned

- {actorName} mentioned your group, "{groupName}", in the document{" "} + {actorName} mentioned the "{groupName}" group in the document{" "} {document.titleWithDefault}.

{body && ( diff --git a/server/models/Notification.test.ts b/server/models/Notification.test.ts index 1d1475f81d..d91438fd31 100644 --- a/server/models/Notification.test.ts +++ b/server/models/Notification.test.ts @@ -49,7 +49,7 @@ describe("Notification", () => { }); }); - describe.only("should return mention reference", () => { + describe("should return mention reference", () => { it("mentioned in document", async () => { const document = await buildDocument(); const notification = await buildNotification({ diff --git a/shared/i18n/locales/en_US/translation.json b/shared/i18n/locales/en_US/translation.json index 6f4700e59b..bcdffb5a9a 100644 --- a/shared/i18n/locales/en_US/translation.json +++ b/shared/i18n/locales/en_US/translation.json @@ -1104,7 +1104,7 @@ "Receive a notification when a document you are subscribed to or a thread you participated in receives a comment": "Receive a notification when a document you are subscribed to or a thread you participated in receives a comment", "Mentioned": "Mentioned", "Receive a notification when someone mentions you in a document or comment": "Receive a notification when someone mentions you in a document or comment", - "Group Mentions": "Group Mentions", + "Group mentions": "Group mentions", "Receive a notification when someone mentions a group you are a member of in a document or comment": "Receive a notification when someone mentions a group you are a member of in a document or comment", "Receive a notification when a comment thread you were involved in is resolved": "Receive a notification when a comment thread you were involved in is resolved", "Reaction added": "Reaction added",