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

---
 extensions/likes/js/forum/src/addLikeAction.js            | 2 +-
 extensions/likes/js/forum/src/addLikesList.js             | 2 +-
 .../js/forum/src/components/PostLikedNotification.js      | 8 ++++----
 .../likes/js/forum/src/components/PostLikesModal.js       | 2 +-
 extensions/likes/js/forum/src/main.js                     | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extensions/likes/js/forum/src/addLikeAction.js b/extensions/likes/js/forum/src/addLikeAction.js
index c2498ac62..7dec9e4bb 100644
--- a/extensions/likes/js/forum/src/addLikeAction.js
+++ b/extensions/likes/js/forum/src/addLikeAction.js
@@ -13,7 +13,7 @@ export default function() {
 
     items.add('like',
       Button.component({
-        children: app.trans(isLiked ? 'flarum-likes.forum.unlike_action' : 'flarum-likes.forum.like_action'),
+        children: app.translator.trans(isLiked ? 'flarum-likes.forum.unlike_action' : 'flarum-likes.forum.like_action'),
         className: 'Button Button--link',
         onclick: () => {
           isLiked = !isLiked;
diff --git a/extensions/likes/js/forum/src/addLikesList.js b/extensions/likes/js/forum/src/addLikesList.js
index 5945f64dc..68d9e44d1 100644
--- a/extensions/likes/js/forum/src/addLikesList.js
+++ b/extensions/likes/js/forum/src/addLikesList.js
@@ -22,7 +22,7 @@ export default function() {
         .map(user => {
           return (
             <a href={app.route.user(user)} config={m.route}>
-              {user === app.session.user ? app.trans('flarum-likes.forum.you') : username(user)}
+              {user === app.session.user ? app.translator.trans('flarum-likes.forum.you') : username(user)}
             </a>
           );
         });
diff --git a/extensions/likes/js/forum/src/components/PostLikedNotification.js b/extensions/likes/js/forum/src/components/PostLikedNotification.js
index 3da98de48..0f733bd5b 100644
--- a/extensions/likes/js/forum/src/components/PostLikedNotification.js
+++ b/extensions/likes/js/forum/src/components/PostLikedNotification.js
@@ -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 PostLikedNotification extends Notification {
   icon() {
@@ -16,11 +16,11 @@ export default class PostLikedNotification extends Notification {
     const user = notification.sender();
     const auc = notification.additionalUnreadCount();
 
-    return app.trans('flarum-likes.forum.post_liked_notification', {
+    return app.translator.trans('flarum-likes.forum.post_liked_notification', {
       user,
-      username: auc ? punctuate([
+      username: auc ? punctuateSeries([
         username(user),
-        app.trans('flarum-likes.forum.others', {count: auc})
+        app.translator.trans('flarum-likes.forum.others', {count: auc})
       ]) : undefined
     });
   }
diff --git a/extensions/likes/js/forum/src/components/PostLikesModal.js b/extensions/likes/js/forum/src/components/PostLikesModal.js
index 8429a145d..3b4ae4e41 100644
--- a/extensions/likes/js/forum/src/components/PostLikesModal.js
+++ b/extensions/likes/js/forum/src/components/PostLikesModal.js
@@ -8,7 +8,7 @@ export default class PostLikesModal extends Modal {
   }
 
   title() {
-    return app.trans('flarum-likes.forum.post_likes_modal_title');
+    return app.translator.trans('flarum-likes.forum.post_likes_modal_title');
   }
 
   content() {
diff --git a/extensions/likes/js/forum/src/main.js b/extensions/likes/js/forum/src/main.js
index 669690b6b..95787623d 100644
--- a/extensions/likes/js/forum/src/main.js
+++ b/extensions/likes/js/forum/src/main.js
@@ -21,7 +21,7 @@ app.initializers.add('flarum-likes', () => {
     items.add('postLiked', {
       name: 'postLiked',
       icon: 'thumbs-o-up',
-      label: app.trans('flarum-likes.forum.notify_post_liked')
+      label: app.translator.trans('flarum-likes.forum.notify_post_liked')
     });
   });
-});
\ No newline at end of file
+});