diff --git a/public/language/en-GB/notifications.json b/public/language/en-GB/notifications.json index 2782fdaff9..0820bfeceb 100644 --- a/public/language/en-GB/notifications.json +++ b/public/language/en-GB/notifications.json @@ -57,10 +57,10 @@ "user-posted-topic": "%1 has posted a new topic: %2", "user-edited-post" : "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", diff --git a/src/topics/tags.js b/src/topics/tags.js index daab4e5f77..540bd314bd 100644 --- a/src/topics/tags.js +++ b/src/topics/tags.js @@ -588,6 +588,7 @@ module.exports = function (Topics) { }; Topics.notifyTagFollowers = async function (postData, exceptUid) { + console.log(); let { tags } = postData.topic; if (!tags.length) { return; @@ -609,13 +610,13 @@ module.exports = function (Topics) { const { displayname } = postData.user; const notifBase = 'notifications:user-posted-topic-with-tag'; - let bodyShort = translator.compile(notifBase, displayname, tags[0]); + let bodyShort = translator.compile(notifBase, displayname, postData.topic.title, tags[0]); if (tags.length === 2) { - bodyShort = translator.compile(`${notifBase}-dual`, displayname, tags[0], tags[1]); + bodyShort = translator.compile(`${notifBase}-dual`, displayname, postData.topic.title, tags[0], tags[1]); } else if (tags.length === 3) { - bodyShort = translator.compile(`${notifBase}-triple`, displayname, tags[0], tags[1], tags[2]); + bodyShort = translator.compile(`${notifBase}-triple`, displayname, postData.topic.title, tags[0], tags[1], tags[2]); } else if (tags.length > 3) { - bodyShort = translator.compile(`${notifBase}-multiple`, displayname, tags.join(', ')); + bodyShort = translator.compile(`${notifBase}-multiple`, displayname, postData.topic.title, tags.join(', ')); } const notification = await notifications.create({