From 3c62230b62cba2cfeb51c20c7feaa51d50974992 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 21 Oct 2015 10:29:48 +1030 Subject: [PATCH] Change `app.trans` calls to `app.translator.trans` calls --- .../js/forum/src/addSubscriptionBadge.js | 4 ++-- .../js/forum/src/addSubscriptionControls.js | 6 +++--- .../js/forum/src/addSubscriptionFilter.js | 2 +- .../src/components/NewPostNotification.js | 2 +- .../forum/src/components/SubscriptionMenu.js | 18 +++++++++--------- extensions/subscriptions/js/forum/src/main.js | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/extensions/subscriptions/js/forum/src/addSubscriptionBadge.js b/extensions/subscriptions/js/forum/src/addSubscriptionBadge.js index a6c312139..8bee04c30 100644 --- a/extensions/subscriptions/js/forum/src/addSubscriptionBadge.js +++ b/extensions/subscriptions/js/forum/src/addSubscriptionBadge.js @@ -9,7 +9,7 @@ export default function addSubscriptionBadge() { switch (this.subscription()) { case 'follow': badge = Badge.component({ - label: app.trans('flarum-subscriptions.forum.following'), + label: app.translator.trans('flarum-subscriptions.forum.following'), icon: 'star', type: 'following' }); @@ -17,7 +17,7 @@ export default function addSubscriptionBadge() { case 'ignore': badge = Badge.component({ - label: app.trans('flarum-subscriptions.forum.ignoring'), + label: app.translator.trans('flarum-subscriptions.forum.ignoring'), icon: 'eye-slash', type: 'ignoring' }); diff --git a/extensions/subscriptions/js/forum/src/addSubscriptionControls.js b/extensions/subscriptions/js/forum/src/addSubscriptionControls.js index cea25cca4..74401784a 100644 --- a/extensions/subscriptions/js/forum/src/addSubscriptionControls.js +++ b/extensions/subscriptions/js/forum/src/addSubscriptionControls.js @@ -9,9 +9,9 @@ export default function addSubscriptionControls() { extend(DiscussionControls, 'userControls', function(items, discussion, context) { if (app.session.user && !(context instanceof DiscussionPage)) { const states = { - none: {label: app.trans('flarum-subscriptions.forum.follow'), icon: 'star', save: 'follow'}, - follow: {label: app.trans('flarum-subscriptions.forum.unfollow'), icon: 'star-o', save: false}, - ignore: {label: app.trans('flarum-subscriptions.forum.unignore'), icon: 'eye', save: false} + none: {label: app.translator.trans('flarum-subscriptions.forum.follow'), icon: 'star', save: 'follow'}, + follow: {label: app.translator.trans('flarum-subscriptions.forum.unfollow'), icon: 'star-o', save: false}, + ignore: {label: app.translator.trans('flarum-subscriptions.forum.unignore'), icon: 'eye', save: false} }; const subscription = discussion.subscription() || 'none'; diff --git a/extensions/subscriptions/js/forum/src/addSubscriptionFilter.js b/extensions/subscriptions/js/forum/src/addSubscriptionFilter.js index 5a2f71d39..10e5243c1 100644 --- a/extensions/subscriptions/js/forum/src/addSubscriptionFilter.js +++ b/extensions/subscriptions/js/forum/src/addSubscriptionFilter.js @@ -12,7 +12,7 @@ export default function addSubscriptionFilter() { items.add('following', LinkButton.component({ href: app.route('index.filter', params), - children: app.trans('flarum-subscriptions.forum.following'), + children: app.translator.trans('flarum-subscriptions.forum.following'), icon: 'star' }), 50); } diff --git a/extensions/subscriptions/js/forum/src/components/NewPostNotification.js b/extensions/subscriptions/js/forum/src/components/NewPostNotification.js index 0b62a2730..35465dd9d 100644 --- a/extensions/subscriptions/js/forum/src/components/NewPostNotification.js +++ b/extensions/subscriptions/js/forum/src/components/NewPostNotification.js @@ -15,6 +15,6 @@ export default class NewPostNotification extends Notification { } content() { - return app.trans('flarum-subscriptions.forum.new_post_notification', {user: this.props.notification.sender()}); + return app.translator.trans('flarum-subscriptions.forum.new_post_notification', {user: this.props.notification.sender()}); } } diff --git a/extensions/subscriptions/js/forum/src/components/SubscriptionMenu.js b/extensions/subscriptions/js/forum/src/components/SubscriptionMenu.js index 836aefa5f..53874edde 100644 --- a/extensions/subscriptions/js/forum/src/components/SubscriptionMenu.js +++ b/extensions/subscriptions/js/forum/src/components/SubscriptionMenu.js @@ -9,18 +9,18 @@ export default class SubscriptionMenu extends Component { const discussion = this.props.discussion; const subscription = discussion.subscription(); - let buttonLabel = app.trans('flarum-subscriptions.forum.follow'); + let buttonLabel = app.translator.trans('flarum-subscriptions.forum.follow'); let buttonIcon = 'star-o'; const buttonClass = 'SubscriptionMenu-button--' + subscription; switch (subscription) { case 'follow': - buttonLabel = app.trans('flarum-subscriptions.forum.following'); + buttonLabel = app.translator.trans('flarum-subscriptions.forum.following'); buttonIcon = 'star'; break; case 'ignore': - buttonLabel = app.trans('flarum-subscriptions.forum.ignoring'); + buttonLabel = app.translator.trans('flarum-subscriptions.forum.ignoring'); buttonIcon = 'eye-slash'; break; @@ -32,20 +32,20 @@ export default class SubscriptionMenu extends Component { { subscription: false, icon: 'star-o', - label: app.trans('flarum-subscriptions.forum.not_following'), - description: app.trans('flarum-subscriptions.forum.not_following_description') + label: app.translator.trans('flarum-subscriptions.forum.not_following'), + description: app.translator.trans('flarum-subscriptions.forum.not_following_description') }, { subscription: 'follow', icon: 'star', - label: app.trans('flarum-subscriptions.forum.following'), - description: app.trans('flarum-subscriptions.forum.following_description') + label: app.translator.trans('flarum-subscriptions.forum.following'), + description: app.translator.trans('flarum-subscriptions.forum.following_description') }, { subscription: 'ignore', icon: 'eye-slash', - label: app.trans('flarum-subscriptions.forum.ignoring'), - description: app.trans('flarum-subscriptions.forum.ignoring_description') + label: app.translator.trans('flarum-subscriptions.forum.ignoring'), + description: app.translator.trans('flarum-subscriptions.forum.ignoring_description') } ]; diff --git a/extensions/subscriptions/js/forum/src/main.js b/extensions/subscriptions/js/forum/src/main.js index 576afcd05..07e4fcab5 100644 --- a/extensions/subscriptions/js/forum/src/main.js +++ b/extensions/subscriptions/js/forum/src/main.js @@ -22,7 +22,7 @@ app.initializers.add('subscriptions', function() { items.add('newPost', { name: 'newPost', icon: 'star', - label: app.trans('flarum-subscriptions.forum.notify_new_post') + label: app.translator.trans('flarum-subscriptions.forum.notify_new_post') }); }); });