diff --git a/install/package.json b/install/package.json
index 4222a20daa..930be88458 100644
--- a/install/package.json
+++ b/install/package.json
@@ -97,13 +97,13 @@
"multer": "2.0.2",
"nconf": "0.13.0",
"nodebb-plugin-2factor": "7.6.1",
- "nodebb-plugin-composer-default": "10.3.6",
+ "nodebb-plugin-composer-default": "10.3.7",
"nodebb-plugin-dbsearch": "6.3.5",
"nodebb-plugin-emoji": "6.0.5",
"nodebb-plugin-emoji-android": "4.1.1",
"nodebb-plugin-link-preview": "2.2.2",
"nodebb-plugin-markdown": "13.2.3",
- "nodebb-plugin-mentions": "4.8.7",
+ "nodebb-plugin-mentions": "4.8.9",
"nodebb-plugin-spam-be-gone": "2.3.2",
"nodebb-plugin-web-push": "0.7.6",
"nodebb-rewards-essentials": "1.0.2",
diff --git a/public/language/en-GB/notifications.json b/public/language/en-GB/notifications.json
index 1a14907ee0..2436ece347 100644
--- a/public/language/en-GB/notifications.json
+++ b/public/language/en-GB/notifications.json
@@ -36,33 +36,33 @@
"user-posted-in-public-room-dual": "%1 and %2 wrote in %4",
"user-posted-in-public-room-triple": "%1, %2 and %3 wrote in %5",
"user-posted-in-public-room-multiple": "%1, %2 and %3 others wrote in %5",
- "upvoted-your-post-in": "%1 upvoted
%2",
- "upvoted-your-post-in-dual": "%1 and %2 upvoted
%3",
- "upvoted-your-post-in-triple": "%1, %2 and %3 upvoted
%4",
- "upvoted-your-post-in-multiple": "%1, %2 and %3 others upvoted
%4.",
+ "upvoted-your-post-in": "%1 upvoted your post in
%2",
+ "upvoted-your-post-in-dual": "%1 and %2 upvoted your post in
%3",
+ "upvoted-your-post-in-triple": "%1, %2 and %3 upvoted your post in
%4",
+ "upvoted-your-post-in-multiple": "%1, %2 and %3 others upvoted your post in
%4.",
"moved-your-post": "%1 has moved your post to %2",
"moved-your-topic": "%1 has moved %2",
- "user-flagged-post-in": "%1 flagged a post
%2",
- "user-flagged-post-in-dual": "%1 and %2 flagged a post
%3",
- "user-flagged-post-in-triple": "%1, %2 and %3 flagged a post
%4",
- "user-flagged-post-in-multiple": "%1, %2 and %3 others flagged a post
%4",
+ "user-flagged-post-in": "%1 flagged a post in
%2",
+ "user-flagged-post-in-dual": "%1 and %2 flagged a post in
%3",
+ "user-flagged-post-in-triple": "%1, %2 and %3 flagged a post in
%4",
+ "user-flagged-post-in-multiple": "%1, %2 and %3 others flagged a post in
%4",
"user-flagged-user": "%1 flagged a user profile (%2)",
"user-flagged-user-dual": "%1 and %2 flagged a user profile (%3)",
"user-flagged-user-triple": "%1, %2 and %3 flagged a user profile (%4)",
"user-flagged-user-multiple": "%1, %2 and %3 others flagged a user profile (%4)",
- "user-posted-to" : "%1 replied in
%2",
- "user-posted-to-dual" : "%1 and %2 replied in
%3",
- "user-posted-to-triple" : "%1, %2 and %3 replied in
%4",
- "user-posted-to-multiple" : "%1, %2 and %3 others replied in
%4",
- "user-posted-topic": "%1 posted
%2",
- "user-edited-post" : "%1 edited a post in
%2",
+ "user-posted-to" : "%1 replied in
%2",
+ "user-posted-to-dual" : "%1 and %2 replied in
%3",
+ "user-posted-to-triple" : "%1, %2 and %3 replied in
%4",
+ "user-posted-to-multiple" : "%1, %2 and %3 others replied in
%4",
+ "user-posted-topic": "%1 posted
%2",
+ "user-edited-post" : "%1 edited a post in
%2",
- "user-posted-topic-with-tag": "%1 posted
%2 (tagged %3)",
- "user-posted-topic-with-tag-dual": "%1 posted
%2 (tagged %3 and %4)",
- "user-posted-topic-with-tag-triple": "%1 posted
%2 (tagged %3, %4, and %5)",
- "user-posted-topic-with-tag-multiple": "%1 posted
%2 (tagged %3)",
+ "user-posted-topic-with-tag": "%1 posted
%2 (tagged %3)",
+ "user-posted-topic-with-tag-dual": "%1 posted
%2 (tagged %3 and %4)",
+ "user-posted-topic-with-tag-triple": "%1 posted
%2 (tagged %3, %4, and %5)",
+ "user-posted-topic-with-tag-multiple": "%1 posted
%2 (tagged %3)",
- "user-posted-topic-in-category": "%1 posted
%2 (category %3)",
+ "user-posted-topic-in-category": "%1 posted
%2 (category %3)",
"user-started-following-you": "%1 started following you.",
"user-started-following-you-dual": "%1 and %2 started following you.",
diff --git a/test/controllers.js b/test/controllers.js
index c6cab42b2e..934e4ae7a3 100644
--- a/test/controllers.js
+++ b/test/controllers.js
@@ -1171,7 +1171,7 @@ describe('Controllers', () => {
assert.equal(response.statusCode, 200);
assert(body);
const notif = body.notifications[0];
- assert.equal(notif.bodyShort, 'test1 has posted a reply to: test2');
+ assert.equal(notif.bodyShort, 'test1 replied in
test2');
assert.equal(notif.bodyLong, notifData.bodyLong);
assert.equal(notif.pid, notifData.pid);
assert.equal(notif.path, nconf.get('relative_path') + notifData.path);
diff --git a/test/translator.js b/test/translator.js
index 04d11112d5..99ff09ebe2 100644
--- a/test/translator.js
+++ b/test/translator.js
@@ -126,7 +126,7 @@ describe('new Translator(language)', () => {
const translator = Translator.create('en-GB');
return translator.translate('[[notifications:user-posted-to, [[global:guest]], My Topic]]').then((translated) => {
- assert.strictEqual(translated, 'Guest has posted a reply to: My Topic');
+ assert.strictEqual(translated, 'Guest replied in
My Topic');
});
});
@@ -134,7 +134,7 @@ describe('new Translator(language)', () => {
const translator = Translator.create('en-GB');
return translator.translate('[[notifications:user-posted-to, [[global:guest]], [[global:guest]]]]').then((translated) => {
- assert.strictEqual(translated, 'Guest has posted a reply to: Guest');
+ assert.strictEqual(translated, 'Guest replied in
Guest');
});
});
@@ -178,7 +178,7 @@ describe('new Translator(language)', () => {
const key = '[[notifications:upvoted-your-post-in, test1, error: Error: [[error:group-name-too-long]] on NodeBB Upgrade]]';
return translator.translate(key).then((translated) => {
- assert.strictEqual(translated, 'test1 has upvoted your post in error: Error: [[error:group-name-too-long]] on NodeBB Upgrade.');
+ assert.strictEqual(translated, 'test1 upvoted your post in
error: Error: [[error:group-name-too-long]] on NodeBB Upgrade');
});
});