github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-21 22:11:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12 from dcsjapan/key-reorganization

Browse Source 
Reorganize key names
This commit is contained in:
Toby Zerner 2015-10-23 16:14:59 +10:30
commit 61d8e8714d
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,7 @@ export default function addComposerAutocomplete() {
const user = post.user();
suggestions.push(
makeSuggestion(user, '@' + user.username() + '#' + post.id(), [
app.translator.trans('flarum-mentions.forum.reply_to_post', {number: post.number()}), ' — ',
app.translator.trans('flarum-mentions.forum.composer.reply_to_post_text', {number: post.number()}), ' — ',
truncate(post.contentPlain(), 200)
], 'MentionsDropdown-post')
);

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

@ -70,6 +70,8 @@ export default function addMentionedByList() {
});
};
// NEEDS TO BE FIXED: The next two blocks of code. See https://github.com/flarum/core/issues/597 for details.
// Create a list of unique users who have replied. So even if a user has
// replied twice, they will only be in this array once.
const used = [];
@ -91,7 +93,7 @@ export default function addMentionedByList() {
config={m.route}
onclick={hidePreview}
data-number={reply.number()}>
{app.session.user === user ? app.translator.trans('flarum-mentions.forum.you') : username(user)}
{app.session.user === user ? app.translator.trans('flarum-mentions.forum.post.you_text') : username(user)}
</a>
);
});
@ -100,7 +102,8 @@ export default function addMentionedByList() {
<div className="Post-mentionedBy" config={config}>
<span className="Post-mentionedBy-summary">
{icon('reply')}
{app.translator.trans('flarum-mentions.forum.post_mentioned_by', {
// PLEASE CHECK: Using the syntax from "addLikesList.js" with "repliers[0]" in place of "likes[0]".
{app.translator.transChoice('flarum-mentions.forum.post.mentioned_by' + (repliers[0] === app.session.user ? '_self' : '') + '_text', names.length, {
count: names.length,
users: punctuateSeries(names)
})}

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

@ -31,7 +31,7 @@ export default function() {
items.add('reply',
Button.component({
className: 'Button Button--link',
children: app.translator.trans('flarum-mentions.forum.reply_link'),
children: app.translator.trans('flarum-mentions.forum.post.reply_link'),
onclick: () => {
const quote = window.getSelection().toString();

8
extensions/mentions/js/forum/src/components/PostMentionedNotification.js
View File

@ -1,6 +1,6 @@
import Notification from 'flarum/components/Notification';
import username from 'flarum/helpers/username';
import punctuate from 'flarum/helpers/punctuate';
import punctuateSeries from 'flarum/helpers/punctuateSeries';
export default class PostMentionedNotification extends Notification {
icon() {
@ -21,11 +21,11 @@ export default class PostMentionedNotification extends Notification {
const auc = notification.additionalUnreadCount();
const user = notification.sender();
return app.translator.trans('flarum-mentions.forum.post_mentioned_notification', {
return app.translator.trans('flarum-mentions.forum.notifications.post_mentioned_text', {
user,
username: auc ? punctuate([
username: auc ? punctuateSeries([
username(user),
app.translator.trans('flarum-mentions.forum.others', {count: auc})
app.translator.trans('flarum-mentions.forum.notifications.others_text', {count: auc})
]) : undefined
});
}

2
extensions/mentions/js/forum/src/components/UserMentionedNotification.js
View File

@ -14,7 +14,7 @@ export default class UserMentionedNotification extends Notification {
content() {
const user = this.props.notification.sender();
return app.translator.trans('flarum-mentions.forum.user_mentioned_notification', {user});
return app.translator.trans('flarum-mentions.forum.notifications.user_mentioned_text', {user});
}
excerpt() {

4
extensions/mentions/js/forum/src/main.js
View File

@ -35,13 +35,13 @@ app.initializers.add('flarum-mentions', function() {
items.add('postMentioned', {
name: 'postMentioned',
icon: 'reply',
label: app.translator.trans('flarum-mentions.forum.notify_post_mentioned')
label: app.translator.trans('flarum-mentions.forum.settings.notify_post_mentioned_label')
});
items.add('userMentioned', {
name: 'userMentioned',
icon: 'at',
label: app.translator.trans('flarum-mentions.forum.notify_user_mentioned')
label: app.translator.trans('flarum-mentions.forum.settings.notify_user_mentioned_label')
});
});