From 5836f1062f18d1719e4bc7eca3651007cc610d0d Mon Sep 17 00:00:00 2001
From: dcsjapan <dcsjapan@users.noreply.github.com>
Date: Fri, 23 Oct 2015 11:29:32 +0900
Subject: [PATCH] Reorganize key names

See [flarum/core #265](https://github.com/flarum/core/issues/265).

- Adjusts key names to three-tier namespacing.
- Extracts previously unextracted strings.
---
 extensions/likes/js/admin/src/main.js                       | 2 +-
 extensions/likes/js/forum/src/addLikeAction.js              | 2 +-
 extensions/likes/js/forum/src/addLikesList.js               | 6 +++---
 .../likes/js/forum/src/components/PostLikedNotification.js  | 2 +-
 extensions/likes/js/forum/src/components/PostLikesModal.js  | 2 +-
 extensions/likes/js/forum/src/main.js                       | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/extensions/likes/js/admin/src/main.js b/extensions/likes/js/admin/src/main.js
index beaa1d08f..63e5680e0 100644
--- a/extensions/likes/js/admin/src/main.js
+++ b/extensions/likes/js/admin/src/main.js
@@ -6,7 +6,7 @@ app.initializers.add('flarum-likes', () => {
   extend(PermissionGrid.prototype, 'replyItems', items => {
     items.add('likePosts', {
       icon: 'thumbs-o-up',
-      label: 'Like posts',
+      label: app.translator.trans('flarum-likes.admin.permissions.like_posts_label'),
       permission: 'discussion.likePosts'
     });
   });
diff --git a/extensions/likes/js/forum/src/addLikeAction.js b/extensions/likes/js/forum/src/addLikeAction.js
index 7dec9e4bb..3aa17f204 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.translator.trans(isLiked ? 'flarum-likes.forum.unlike_action' : 'flarum-likes.forum.like_action'),
+        children: app.translator.trans(isLiked ? 'flarum-likes.forum.post.unlike_link' : 'flarum-likes.forum.post.like_link'),
         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 707b20acc..6505fa62e 100644
--- a/extensions/likes/js/forum/src/addLikesList.js
+++ b/extensions/likes/js/forum/src/addLikesList.js
@@ -23,7 +23,7 @@ export default function() {
         .map(user => {
           return (
             <a href={app.route.user(user)} config={m.route}>
-              {user === app.session.user ? app.translator.trans('flarum-likes.forum.you') : username(user)}
+              {user === app.session.user ? app.translator.trans('flarum-likes.forum.post.you_text') : username(user)}
             </a>
           );
         });
@@ -39,7 +39,7 @@ export default function() {
             e.preventDefault();
             app.modal.show(new PostLikesModal({post}));
           }}>
-            {app.translator.transChoice('flarum-likes.forum.others', count, {count})}
+            {app.translator.transChoice('flarum-likes.forum.post.others_link', count, {count})}
           </a>
         );
       }
@@ -47,7 +47,7 @@ export default function() {
       items.add('liked', (
         <div className="Post-likedBy">
           {icon('thumbs-o-up')}
-          {app.translator.transChoice('flarum-likes.forum.post_liked_by' + (likes[0] === app.session.user ? '_self' : ''), names.length, {
+          {app.translator.transChoice('flarum-likes.forum.post.liked_by' + (likes[0] === app.session.user ? '_self' : '') + '_text', names.length, {
             count: names.length,
             users: punctuateSeries(names)
           })}
diff --git a/extensions/likes/js/forum/src/components/PostLikedNotification.js b/extensions/likes/js/forum/src/components/PostLikedNotification.js
index 0f733bd5b..90af0a645 100644
--- a/extensions/likes/js/forum/src/components/PostLikedNotification.js
+++ b/extensions/likes/js/forum/src/components/PostLikedNotification.js
@@ -16,7 +16,7 @@ export default class PostLikedNotification extends Notification {
     const user = notification.sender();
     const auc = notification.additionalUnreadCount();
 
-    return app.translator.trans('flarum-likes.forum.post_liked_notification', {
+    return app.translator.trans('flarum-likes.forum.notifications.post_liked_text', {
       user,
       username: auc ? punctuateSeries([
         username(user),
diff --git a/extensions/likes/js/forum/src/components/PostLikesModal.js b/extensions/likes/js/forum/src/components/PostLikesModal.js
index 3b4ae4e41..62f3d7649 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.translator.trans('flarum-likes.forum.post_likes_modal_title');
+    return app.translator.trans('flarum-likes.forum.post_likes.title');
   }
 
   content() {
diff --git a/extensions/likes/js/forum/src/main.js b/extensions/likes/js/forum/src/main.js
index 95787623d..1e6441951 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.translator.trans('flarum-likes.forum.notify_post_liked')
+      label: app.translator.trans('flarum-likes.forum.settings.notify_post_liked_label')
     });
   });
 });