Merge pull request #4600 from jsilvanus/master

FEATURE: Split Reply-button into 'Reply Post' and 'Reply Topic'
discourse · Jan 26, 2017 · f46f8ff · f46f8ff
2 parents 43a8a7c + 810176b
commit f46f8ff
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 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
@@ -68,8 +68,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 name="after-topic-footer-main-buttons"

diff --git 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
@@ -1554,8 +1554,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"