mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-28 20:20:34 +02:00
Code Issues Releases Wiki Activity

Merge pull request #21 from nodum/master

Browse Source 
Fix: Someuser vs. You (mention) -- In English: the same.
This commit is contained in:
Toby Zerner
2016-08-29 17:16:58 +09:30
committed by GitHub
parent bfa9a1d68e 9ca106e136
commit c3cb99549c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/mentions/js/forum/dist/extension.js vendored
View File

@@ -455,7 +455,7 @@ System.register('flarum/mentions/addMentionedByList', ['flarum/extend', 'flarum/
'span', 'span',
{ className: 'Post-mentionedBy-summary' }, { className: 'Post-mentionedBy-summary' },
icon('reply'), 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].user() === app.session.user ? '_self' : '') + '_text', names.length, {
count: names.length, count: names.length,
users: punctuateSeries(names) users: punctuateSeries(names)
}) })

2
extensions/mentions/js/forum/src/addMentionedByList.js
View File

@@ -116,7 +116,7 @@ export default function addMentionedByList() {
<div className="Post-mentionedBy" config={config}> <div className="Post-mentionedBy" config={config}>
<span className="Post-mentionedBy-summary"> <span className="Post-mentionedBy-summary">
{icon('reply')} {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].user() === app.session.user ? '_self' : '') + '_text', names.length, {
count: names.length, count: names.length,
users: punctuateSeries(names) users: punctuateSeries(names)
})} })}