From 117fc7d46b03a63cc3f7f5d0eea7dcc9ee2b460f Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Wed, 21 Oct 2015 10:30:09 +1030
Subject: [PATCH] Change `app.trans` calls to `app.translator.trans` calls

---
 extensions/tags/js/forum/src/addTagComposer.js              | 2 +-
 extensions/tags/js/forum/src/addTagControl.js               | 2 +-
 extensions/tags/js/forum/src/addTagList.js                  | 4 ++--
 .../tags/js/forum/src/components/TagDiscussionModal.js      | 6 +++---
 extensions/tags/js/forum/src/components/TagLinkButton.js    | 2 +-
 extensions/tags/js/lib/helpers/tagLabel.js                  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extensions/tags/js/forum/src/addTagComposer.js b/extensions/tags/js/forum/src/addTagComposer.js
index 8cd8c5dab..c43c45705 100644
--- a/extensions/tags/js/forum/src/addTagComposer.js
+++ b/extensions/tags/js/forum/src/addTagComposer.js
@@ -35,7 +35,7 @@ export default function() {
       <a className="DiscussionComposer-changeTags" onclick={this.chooseTags.bind(this)}>
         {this.tags.length
           ? 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>
     ), 10);
   });
diff --git a/extensions/tags/js/forum/src/addTagControl.js b/extensions/tags/js/forum/src/addTagControl.js
index 994211880..c84cbbac8 100644
--- a/extensions/tags/js/forum/src/addTagControl.js
+++ b/extensions/tags/js/forum/src/addTagControl.js
@@ -9,7 +9,7 @@ export default function() {
   extend(DiscussionControls, 'moderationControls', function(items, discussion) {
     if (discussion.canTag()) {
       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',
         onclick: () => app.modal.show(new TagDiscussionModal({discussion}))
       }));
diff --git a/extensions/tags/js/forum/src/addTagList.js b/extensions/tags/js/forum/src/addTagList.js
index 3f8bdf2fd..7f29eb8ab 100644
--- a/extensions/tags/js/forum/src/addTagList.js
+++ b/extensions/tags/js/forum/src/addTagList.js
@@ -13,7 +13,7 @@ export default function() {
   extend(IndexPage.prototype, 'navItems', function(items) {
     items.add('tags', LinkButton.component({
       icon: 'th-large',
-      children: app.trans('flarum-tags.forum.tags'),
+      children: app.translator.trans('flarum-tags.forum.tags'),
       href: app.route('tags')
     }), -10);
 
@@ -47,7 +47,7 @@ export default function() {
 
     if (more.length) {
       items.add('moreTags', LinkButton.component({
-        children: app.trans('flarum-tags.forum.more'),
+        children: app.translator.trans('flarum-tags.forum.more'),
         href: app.route('tags')
       }), -10);
     }
diff --git a/extensions/tags/js/forum/src/components/TagDiscussionModal.js b/extensions/tags/js/forum/src/components/TagDiscussionModal.js
index 5d2369086..899509d4a 100644
--- a/extensions/tags/js/forum/src/components/TagDiscussionModal.js
+++ b/extensions/tags/js/forum/src/components/TagDiscussionModal.js
@@ -85,8 +85,8 @@ export default class TagDiscussionModal extends Modal {
 
   title() {
     return this.props.discussion
-      ? app.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.edit_discussion_tags_title', {title: <em>{this.props.discussion.title()}</em>})
+      : app.translator.trans('flarum-tags.forum.tag_new_discussion_title');
   }
 
   getInstruction(primaryCount, secondaryCount) {
@@ -162,7 +162,7 @@ export default class TagDiscussionModal extends Modal {
               className: 'Button Button--primary',
               disabled: primaryCount < this.minPrimary || secondaryCount < this.minSecondary,
               icon: 'check',
-              children: app.trans('flarum-tags.forum.confirm')
+              children: app.translator.trans('flarum-tags.forum.confirm')
             })}
           </div>
         </div>
diff --git a/extensions/tags/js/forum/src/components/TagLinkButton.js b/extensions/tags/js/forum/src/components/TagLinkButton.js
index e4fc44c04..5a7eb2569 100644
--- a/extensions/tags/js/forum/src/components/TagLinkButton.js
+++ b/extensions/tags/js/forum/src/components/TagLinkButton.js
@@ -22,6 +22,6 @@ export default class TagLinkButton extends LinkButton {
 
     props.params.tags = tag ? tag.slug() : 'untagged';
     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');
   }
 }
diff --git a/extensions/tags/js/lib/helpers/tagLabel.js b/extensions/tags/js/lib/helpers/tagLabel.js
index 8b365858e..301ae3f23 100644
--- a/extensions/tags/js/lib/helpers/tagLabel.js
+++ b/extensions/tags/js/lib/helpers/tagLabel.js
@@ -25,7 +25,7 @@ export default function tagLabel(tag, attrs = {}) {
   return (
     m((link ? 'a' : 'span'), attrs,
       <span className="TagLabel-text">
-        {tag ? tag.name() : app.trans('flarum-tags.forum.deleted')}
+        {tag ? tag.name() : app.translator.trans('flarum-tags.forum.deleted')}
       </span>
     )
   );