From 1beb96d958ebeec18093a12d205ac22155b834e0 Mon Sep 17 00:00:00 2001
From: David Joy <davidjoy@users.noreply.github.com>
Date: Tue, 6 Apr 2021 12:17:52 -0400
Subject: [PATCH] fix: consistent apply button labels (#69)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

“applied” and “applying” instead of “saved” and “saving”
---
 .../discussions/Discussions.jsx               |  4 +--
 .../discussions/messages.js                   | 25 ++++++++-----------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/pages-and-resources/discussions/Discussions.jsx b/src/pages-and-resources/discussions/Discussions.jsx
index 3bb20b6eb..920565d39 100644
--- a/src/pages-and-resources/discussions/Discussions.jsx
+++ b/src/pages-and-resources/discussions/Discussions.jsx
@@ -134,8 +134,8 @@ function Discussions({ courseId, intl }) {
               <StatefulButton
                 labels={{
                   default: intl.formatMessage(messages.applyButton),
-                  pending: intl.formatMessage(messages.savingConfig),
-                  complete: intl.formatMessage(messages.savedConfig),
+                  pending: intl.formatMessage(messages.applyingButton),
+                  complete: intl.formatMessage(messages.appliedButton),
                 }}
                 state={submitButtonState}
                 className="mr-3"
diff --git a/src/pages-and-resources/discussions/messages.js b/src/pages-and-resources/discussions/messages.js
index 912d92329..39cf8b9af 100644
--- a/src/pages-and-resources/discussions/messages.js
+++ b/src/pages-and-resources/discussions/messages.js
@@ -25,21 +25,6 @@ const messages = defineMessages({
     id: 'authoring.discussions.modalTitle',
     defaultMessage: 'Configure {name}',
   },
-  saveConfig: {
-    id: 'authoring.discussions.saveConfig',
-    defaultMessage: 'Save',
-    description: 'Button allowing a user to save their discussions config.',
-  },
-  savingConfig: {
-    id: 'authoring.discussions.savingConfig',
-    defaultMessage: 'Saving',
-    description: 'Button text shown while a discussion config is being saved.',
-  },
-  savedConfig: {
-    id: 'authoring.discussions.savedConfig',
-    defaultMessage: 'Saved',
-    description: 'Button text shown once a discussion config has been saved to the server.',
-  },
   backButton: {
     id: 'authoring.discussions.backButton',
     defaultMessage: 'Back',
@@ -55,6 +40,16 @@ const messages = defineMessages({
     defaultMessage: 'Apply',
     description: 'Button allowing the user to submit their discussion configuration.',
   },
+  applyingButton: {
+    id: 'authoring.discussions.applyingButton',
+    defaultMessage: 'Applying',
+    description: 'Button label when the discussion configuration is being submitted.',
+  },
+  appliedButton: {
+    id: 'authoring.discussions.appliedButton',
+    defaultMessage: 'Applied',
+    description: 'Button label when the discussion configuration has been successfully submitted.',
+  },
   selectDiscussionTool: {
     id: 'authoring.discussions.selectDiscussionTool',
     defaultMessage: 'Select discussion tool',