mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-11 10:55:47 +02:00
Code Issues Releases Wiki Activity

Change app.trans calls to app.translator.trans calls

Browse Source
This commit is contained in:
Toby Zerner
2015-10-21 10:30:09 +10:30
parent bf04dba33e
commit 117fc7d46b
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/tags/js/forum/src/addTagComposer.js
View File

@@ -35,7 +35,7 @@ export default function() {
<a className="DiscussionComposer-changeTags" onclick={this.chooseTags.bind(this)}> <a className="DiscussionComposer-changeTags" onclick={this.chooseTags.bind(this)}>
{this.tags.length {this.tags.length
? tagsLabel(this.tags) ? tagsLabel(this.tags)
: <span className="TagLabel untagged">{app.trans('flarum-tags.forum.tag_new_discussion_link')}</span>} : <span className="TagLabel untagged">{app.translator.trans('flarum-tags.forum.tag_new_discussion_link')}</span>}
</a> </a>
), 10); ), 10);
}); });

2
extensions/tags/js/forum/src/addTagControl.js
View File

@@ -9,7 +9,7 @@ export default function() {
extend(DiscussionControls, 'moderationControls', function(items, discussion) { extend(DiscussionControls, 'moderationControls', function(items, discussion) {
if (discussion.canTag()) { if (discussion.canTag()) {
items.add('tags', Button.component({ items.add('tags', Button.component({
children: app.trans('flarum-tags.forum.edit_discussion_tags_link'), children: app.translator.trans('flarum-tags.forum.edit_discussion_tags_link'),
icon: 'tag', icon: 'tag',
onclick: () => app.modal.show(new TagDiscussionModal({discussion})) onclick: () => app.modal.show(new TagDiscussionModal({discussion}))
})); }));

4
extensions/tags/js/forum/src/addTagList.js
View File

@@ -13,7 +13,7 @@ export default function() {
extend(IndexPage.prototype, 'navItems', function(items) { extend(IndexPage.prototype, 'navItems', function(items) {
items.add('tags', LinkButton.component({ items.add('tags', LinkButton.component({
icon: 'th-large', icon: 'th-large',
children: app.trans('flarum-tags.forum.tags'), children: app.translator.trans('flarum-tags.forum.tags'),
href: app.route('tags') href: app.route('tags')
}), -10); }), -10);
@@ -47,7 +47,7 @@ export default function() {
if (more.length) { if (more.length) {
items.add('moreTags', LinkButton.component({ items.add('moreTags', LinkButton.component({
children: app.trans('flarum-tags.forum.more'), children: app.translator.trans('flarum-tags.forum.more'),
href: app.route('tags') href: app.route('tags')
}), -10); }), -10);
} }

6
extensions/tags/js/forum/src/components/TagDiscussionModal.js
View File

@@ -85,8 +85,8 @@ export default class TagDiscussionModal extends Modal {
title() { title() {
return this.props.discussion return this.props.discussion
? app.trans('flarum-tags.forum.edit_discussion_tags_title', {title: <em>{this.props.discussion.title()}</em>}) ? app.translator.trans('flarum-tags.forum.edit_discussion_tags_title', {title: <em>{this.props.discussion.title()}</em>})
: app.trans('flarum-tags.forum.tag_new_discussion_title'); : app.translator.trans('flarum-tags.forum.tag_new_discussion_title');
} }
getInstruction(primaryCount, secondaryCount) { getInstruction(primaryCount, secondaryCount) {
@@ -162,7 +162,7 @@ export default class TagDiscussionModal extends Modal {
className: 'Button Button--primary', className: 'Button Button--primary',
disabled: primaryCount < this.minPrimary || secondaryCount < this.minSecondary, disabled: primaryCount < this.minPrimary || secondaryCount < this.minSecondary,
icon: 'check', icon: 'check',
children: app.trans('flarum-tags.forum.confirm') children: app.translator.trans('flarum-tags.forum.confirm')
})} })}
</div> </div>
</div> </div>

2
extensions/tags/js/forum/src/components/TagLinkButton.js
View File

@@ -22,6 +22,6 @@ export default class TagLinkButton extends LinkButton {
props.params.tags = tag ? tag.slug() : 'untagged'; props.params.tags = tag ? tag.slug() : 'untagged';
props.href = app.route('tag', props.params); props.href = app.route('tag', props.params);
props.children = tag ? tag.name() : app.trans('flarum-tags.forum.untagged'); props.children = tag ? tag.name() : app.translator.trans('flarum-tags.forum.untagged');
} }
} }

2
extensions/tags/js/lib/helpers/tagLabel.js
View File

@@ -25,7 +25,7 @@ export default function tagLabel(tag, attrs = {}) {
return ( return (
m((link ? 'a' : 'span'), attrs, m((link ? 'a' : 'span'), attrs,
<span className="TagLabel-text"> <span className="TagLabel-text">
{tag ? tag.name() : app.trans('flarum-tags.forum.deleted')} {tag ? tag.name() : app.translator.trans('flarum-tags.forum.deleted')}
</span> </span>
) )
); );