From 160f09281057d95c9f301efb0ea193f3fa6c9154 Mon Sep 17 00:00:00 2001
From: dcsjapan <dcsjapan@users.noreply.github.com>
Date: Thu, 22 Oct 2015 09:21:00 +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/sticky/js/admin/src/main.js                        | 2 +-
 extensions/sticky/js/forum/src/addStickyBadge.js              | 2 +-
 extensions/sticky/js/forum/src/addStickyControl.js            | 2 +-
 .../js/forum/src/components/DiscussionStickiedNotification.js | 2 +-
 .../sticky/js/forum/src/components/DiscussionStickiedPost.js  | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extensions/sticky/js/admin/src/main.js b/extensions/sticky/js/admin/src/main.js
index eaad2fedf..08879f01f 100644
--- a/extensions/sticky/js/admin/src/main.js
+++ b/extensions/sticky/js/admin/src/main.js
@@ -6,7 +6,7 @@ app.initializers.add('flarum-sticky', () => {
   extend(PermissionGrid.prototype, 'moderateItems', items => {
     items.add('sticky', {
       icon: 'thumb-tack',
-      label: 'Sticky discussions',
+      label: app.translator.trans('flarum-sticky.admin.permissions.sticky_discussions_label'),
       permission: 'discussion.sticky'
     }, 95);
   });
diff --git a/extensions/sticky/js/forum/src/addStickyBadge.js b/extensions/sticky/js/forum/src/addStickyBadge.js
index b6e05bda5..8d0d7ca2d 100644
--- a/extensions/sticky/js/forum/src/addStickyBadge.js
+++ b/extensions/sticky/js/forum/src/addStickyBadge.js
@@ -7,7 +7,7 @@ export default function addStickyBadge() {
     if (this.isSticky()) {
       badges.add('sticky', Badge.component({
         type: 'sticky',
-        label: app.translator.trans('flarum-sticky.forum.stickied'),
+        label: app.translator.trans('flarum-sticky.forum.badge.sticky_tooltip'),
         icon: 'thumb-tack'
       }), 10);
     }
diff --git a/extensions/sticky/js/forum/src/addStickyControl.js b/extensions/sticky/js/forum/src/addStickyControl.js
index e14179bff..c08aff5e9 100644
--- a/extensions/sticky/js/forum/src/addStickyControl.js
+++ b/extensions/sticky/js/forum/src/addStickyControl.js
@@ -7,7 +7,7 @@ export default function addStickyControl() {
   extend(DiscussionControls, 'moderationControls', function(items, discussion) {
     if (discussion.canSticky()) {
       items.add('sticky', Button.component({
-        children: app.translator.trans(discussion.isSticky() ? 'flarum-sticky.forum.unsticky' : 'flarum-sticky.forum.sticky'),
+        children: app.translator.trans(discussion.isSticky() ? 'flarum-sticky.forum.discussion_controls.unsticky_button' : 'flarum-sticky.forum.discussion_controls.sticky_button'),
         icon: 'thumb-tack',
         onclick: this.stickyAction.bind(discussion)
       }));
diff --git a/extensions/sticky/js/forum/src/components/DiscussionStickiedNotification.js b/extensions/sticky/js/forum/src/components/DiscussionStickiedNotification.js
index 1101591d5..593431262 100644
--- a/extensions/sticky/js/forum/src/components/DiscussionStickiedNotification.js
+++ b/extensions/sticky/js/forum/src/components/DiscussionStickiedNotification.js
@@ -12,6 +12,6 @@ export default class DiscussionStickiedNotification extends Notification {
   }
 
   content() {
-    return app.translator.trans('flarum-sticky.forum.discussion_stickied_notification', {user: this.props.notification.sender()});
+    return '{username} stickied';
   }
 }
diff --git a/extensions/sticky/js/forum/src/components/DiscussionStickiedPost.js b/extensions/sticky/js/forum/src/components/DiscussionStickiedPost.js
index 613c46683..bd207c035 100644
--- a/extensions/sticky/js/forum/src/components/DiscussionStickiedPost.js
+++ b/extensions/sticky/js/forum/src/components/DiscussionStickiedPost.js
@@ -7,7 +7,7 @@ export default class DiscussionStickiedPost extends EventPost {
 
   descriptionKey() {
     return this.props.post.content().sticky
-      ? 'flarum-sticky.forum.discussion_stickied_post'
-      : 'flarum-sticky.forum.discussion_unstickied_post';
+      ? 'flarum-sticky.forum.post_stream.discussion_stickied_text'
+      : 'flarum-sticky.forum.post_stream.discussion_unstickied_text';
   }
 }