From beba481bc872b863e92cba3b438f617d05a56fc3 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Fri, 31 Mar 2017 11:54:20 +0800
Subject: [PATCH] UX: Update copy to remove a topic status update.

---
 .../controllers/edit-topic-status-update.js.es6          | 9 ---------
 .../templates/modal/edit-topic-status-update.hbs         | 4 +++-
 config/locales/client.en.yml                             | 3 +--
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6 b/app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6
index ad4c1d87510..b07fcd2f3ef 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6
@@ -41,15 +41,6 @@ export default Ember.Controller.extend(ModalFunctionality, {
     return Ember.isEmpty(updateTime) || updateTimeInvalid || loading;
   },
 
-  @computed('autoReopen', 'autoClose')
-  removeStatusUpdateLabel(autoReopen, autoClose) {
-    if (autoReopen) {
-      return 'topic.auto_reopen.remove';
-    } else if (autoClose) {
-      return 'topic.auto_close.remove';
-    }
-  },
-
   @observes("topicStatusUpdate.execute_at", "topicStatusUpdate.duration")
   setAutoCloseTime() {
     let time = null;
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-status-update.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-status-update.hbs
index e9bcb815a1d..eddb6602c7e 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-topic-status-update.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-status-update.hbs
@@ -58,7 +58,9 @@
     {{conditional-loading-spinner size="small" condition=loading}}
 
     {{#if topicStatusUpdate.execute_at}}
-      {{d-button class="pull-right" action="removeStatusUpdate" label=removeStatusUpdateLabel}}
+      {{d-button class="pull-right btn-danger"
+          action="removeStatusUpdate"
+          label='topic.topic_status_update.remove'}}
     {{/if}}
   </div>
 </form>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 467e5028f8d..044a99738a2 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1473,6 +1473,7 @@ en:
         title: "Set Topic Timer"
         save: "Set Timer"
         time: "Time:"
+        remove: "Remove Timer"
       auto_update_input:
         limited:
           units: "(# of hours)"
@@ -1482,13 +1483,11 @@ en:
           examples: 'Enter number of hours (24), absolute time (17:30) or timestamp (2013-11-22 14:00).'
       auto_reopen:
         title: "Auto-open Topic"
-        remove: "Don't Auto-Reopen This Topic"
       auto_close:
         title: "Auto-Close Topic"
         label: "Auto-close topic time:"
         error: "Please enter a valid value."
         based_on_last_post: "Don't close until the last post in the topic is at least this old."
-        remove: "Don't Auto-Close This Topic"
 
       status_update_notice:
         auto_open: "This topic will automatically open %{timeLeft}."