From bb35bd526883e9366f4883171e3616ff4b909e19 Mon Sep 17 00:00:00 2001 From: Wietse Wind Date: Mon, 29 Aug 2016 09:27:30 +0200 Subject: [PATCH 1/2] Fix: Someuser vs. You (mention) -- In English: the same. In Dutch: Jij hebt / Someuser HEEFT -> _self text was ignored, comparing POST with USER object. --- extensions/mentions/js/forum/dist/extension.js | 2 +- extensions/mentions/js/forum/src/addMentionedByList.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/mentions/js/forum/dist/extension.js b/extensions/mentions/js/forum/dist/extension.js index db9297818..855675b09 100644 --- a/extensions/mentions/js/forum/dist/extension.js +++ b/extensions/mentions/js/forum/dist/extension.js @@ -455,7 +455,7 @@ System.register('flarum/mentions/addMentionedByList', ['flarum/extend', 'flarum/ 'span', { className: 'Post-mentionedBy-summary' }, icon('reply'), - app.translator.transChoice('flarum-mentions.forum.post.mentioned_by' + (replies[0] === app.session.user ? '_self' : '') + '_text', names.length, { + app.translator.transChoice('flarum-mentions.forum.post.mentioned_by' + (replies[0].data.relationships.user.data.id === app.session.user.data.id ? '_self' : '') + '_text', names.length, { count: names.length, users: punctuateSeries(names) }) diff --git a/extensions/mentions/js/forum/src/addMentionedByList.js b/extensions/mentions/js/forum/src/addMentionedByList.js index 058d52db0..8a85eb03d 100644 --- a/extensions/mentions/js/forum/src/addMentionedByList.js +++ b/extensions/mentions/js/forum/src/addMentionedByList.js @@ -116,7 +116,7 @@ export default function addMentionedByList() {
{icon('reply')} - {app.translator.transChoice('flarum-mentions.forum.post.mentioned_by' + (replies[0] === app.session.user ? '_self' : '') + '_text', names.length, { + {app.translator.transChoice('flarum-mentions.forum.post.mentioned_by' + (replies[0].data.relationships.user.data.id === app.session.user.data.id ? '_self' : '') + '_text', names.length, { count: names.length, users: punctuateSeries(names) })} From 9ca106e13683d65727a34a143a27281b51b65ba1 Mon Sep 17 00:00:00 2001 From: Wietse Wind Date: Mon, 29 Aug 2016 09:37:20 +0200 Subject: [PATCH 2/2] Amend Pull Request #21 --- extensions/mentions/js/forum/dist/extension.js | 2 +- extensions/mentions/js/forum/src/addMentionedByList.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/mentions/js/forum/dist/extension.js b/extensions/mentions/js/forum/dist/extension.js index 855675b09..273b738c0 100644 --- a/extensions/mentions/js/forum/dist/extension.js +++ b/extensions/mentions/js/forum/dist/extension.js @@ -455,7 +455,7 @@ System.register('flarum/mentions/addMentionedByList', ['flarum/extend', 'flarum/ 'span', { className: 'Post-mentionedBy-summary' }, icon('reply'), - app.translator.transChoice('flarum-mentions.forum.post.mentioned_by' + (replies[0].data.relationships.user.data.id === app.session.user.data.id ? '_self' : '') + '_text', names.length, { + app.translator.transChoice('flarum-mentions.forum.post.mentioned_by' + (replies[0].user() === app.session.user ? '_self' : '') + '_text', names.length, { count: names.length, users: punctuateSeries(names) }) diff --git a/extensions/mentions/js/forum/src/addMentionedByList.js b/extensions/mentions/js/forum/src/addMentionedByList.js index 8a85eb03d..9b6d8c898 100644 --- a/extensions/mentions/js/forum/src/addMentionedByList.js +++ b/extensions/mentions/js/forum/src/addMentionedByList.js @@ -116,7 +116,7 @@ export default function addMentionedByList() {
{icon('reply')} - {app.translator.transChoice('flarum-mentions.forum.post.mentioned_by' + (replies[0].data.relationships.user.data.id === app.session.user.data.id ? '_self' : '') + '_text', names.length, { + {app.translator.transChoice('flarum-mentions.forum.post.mentioned_by' + (replies[0].user() === app.session.user ? '_self' : '') + '_text', names.length, { count: names.length, users: punctuateSeries(names) })}