From 817f4cd0fc4ef6be4fdedd20bf9d1da51ecd075a Mon Sep 17 00:00:00 2001
From: Juha Leinonen <jsilvanus@gmail.com>
Date: Tue, 13 Dec 2016 03:53:01 +0200
Subject: [PATCH] FEATURE: Split Reply-button into 'Reply Post' and 'Reply
 Topic'

---
 .../templates/components/topic-footer-buttons.hbs         | 4 ++--
 app/assets/javascripts/discourse/widgets/post-menu.js.es6 | 2 +-
 config/locales/client.en.yml                              | 8 ++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
index 518abc95c28..83ed1bfe244 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
@@ -49,8 +49,8 @@
   {{d-button class="btn-primary create"
              icon="reply"
              action="replyToPost"
-             label="topic.reply.title"
-             title="topic.reply.help"}}
+             label="topic.reply.topic.title"
+             title="topic.reply.topic.help"}}
 {{/if}}
 
 {{plugin-outlet "after-topic-footer-main-buttons" tagName="span"}}
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index 4c39f4a5421..cf3b3127f4f 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -135,7 +135,7 @@ registerButton('reply', attrs => {
   if (!attrs.canCreatePost) { return; }
 
   if (!attrs.mobileView) {
-    args.label = 'topic.reply.title';
+    args.label = 'topic.reply.post.title';
   }
 
   return args;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c5c9c3443b6..62cd9883e82 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1542,8 +1542,12 @@ en:
         remove_banner: "Remove Banner Topic"
 
       reply:
-        title: 'Reply'
-        help: 'begin composing a reply to this topic'
+        post:
+          title: 'Reply'
+          # help i.e. tooltop is at controls.reply
+        topic:
+          title: 'Reply'
+          help: 'begin composing a reply to this topic'
 
       clear_pin:
         title: "Clear pin"