From 26c0c7866028a5afcc11ccb26a82f1afa3cfb787 Mon Sep 17 00:00:00 2001 From: Bernard Szabo Date: Mon, 4 Apr 2022 17:08:23 -0400 Subject: [PATCH 1/4] refactor: use consistent ordering for header/footer attributes --- src/editors/components/EditorHeader/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editors/components/EditorHeader/messages.js b/src/editors/components/EditorHeader/messages.js index e67e865dc..7c244ab9e 100644 --- a/src/editors/components/EditorHeader/messages.js +++ b/src/editors/components/EditorHeader/messages.js @@ -1,8 +1,8 @@ export const messages = { loading: { id: 'authoring.texteditor.title.loading', - description: 'Message displayed while loading content', defaultMessage: 'Loading...', + description: 'Message displayed while loading content', }, cancelChangesLabel: { id: 'authoring.texteditor.header.cancelChangesLabel', From d79ee29b963ad70a1554460052c3e432f8410615 Mon Sep 17 00:00:00 2001 From: Bernard Szabo Date: Thu, 7 Apr 2022 16:03:17 -0400 Subject: [PATCH 2/4] refactor: consistent naming and default message for saveButton label Prior to this change Aria message and default message were different --- .../components/EditorFooter/__snapshots__/index.test.jsx.snap | 4 ++-- src/editors/components/EditorFooter/index.jsx | 2 +- src/editors/components/EditorFooter/messages.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/editors/components/EditorFooter/__snapshots__/index.test.jsx.snap b/src/editors/components/EditorFooter/__snapshots__/index.test.jsx.snap index aa7706a43..334508ee4 100644 --- a/src/editors/components/EditorFooter/__snapshots__/index.test.jsx.snap +++ b/src/editors/components/EditorFooter/__snapshots__/index.test.jsx.snap @@ -48,7 +48,7 @@ exports[`EditorFooter snapshots Save Failed, error message raised 1`] = ` } > @@ -143,7 +143,7 @@ exports[`EditorFooter snapshots renders as expected with default behavior 1`] = } > diff --git a/src/editors/components/EditorFooter/index.jsx b/src/editors/components/EditorFooter/index.jsx index dc5e4a379..b472cc919 100644 --- a/src/editors/components/EditorFooter/index.jsx +++ b/src/editors/components/EditorFooter/index.jsx @@ -56,7 +56,7 @@ export const EditorFooter = ({ disabled={!isInitialized} > {isInitialized - ? + ? : } diff --git a/src/editors/components/EditorFooter/messages.js b/src/editors/components/EditorFooter/messages.js index 3fcdab231..1f701ccb5 100644 --- a/src/editors/components/EditorFooter/messages.js +++ b/src/editors/components/EditorFooter/messages.js @@ -19,9 +19,9 @@ export const messages = { defaultMessage: 'Save Changes and Return to Learning Context', description: 'Aria label for save button', }, - addToCourse: { + saveButtonLabel: { id: 'authoring.editorfooter.savebutton.label', - defaultMessage: 'Save', + defaultMessage: 'Save Changes and Return to Learning Context', description: 'Label for Save button', }, }; From 48fcfb0e00ebd420957011bcd09226b88a383547 Mon Sep 17 00:00:00 2001 From: Bernard Szabo Date: Fri, 8 Apr 2022 16:52:34 -0400 Subject: [PATCH 3/4] refactor: Preserve button default messages description for aria labels may explicitly reference intended screensaver use, but label names and ids should remain unchanged --- .../EditorFooter/__snapshots__/index.test.jsx.snap | 4 ++-- src/editors/components/EditorFooter/messages.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/editors/components/EditorFooter/__snapshots__/index.test.jsx.snap b/src/editors/components/EditorFooter/__snapshots__/index.test.jsx.snap index 334508ee4..aa7706a43 100644 --- a/src/editors/components/EditorFooter/__snapshots__/index.test.jsx.snap +++ b/src/editors/components/EditorFooter/__snapshots__/index.test.jsx.snap @@ -48,7 +48,7 @@ exports[`EditorFooter snapshots Save Failed, error message raised 1`] = ` } > @@ -143,7 +143,7 @@ exports[`EditorFooter snapshots renders as expected with default behavior 1`] = } > diff --git a/src/editors/components/EditorFooter/messages.js b/src/editors/components/EditorFooter/messages.js index 1f701ccb5..59b338ac7 100644 --- a/src/editors/components/EditorFooter/messages.js +++ b/src/editors/components/EditorFooter/messages.js @@ -7,7 +7,7 @@ export const messages = { cancelButtonAriaLabel: { id: 'authoring.editorfooter.cancelButton.ariaLabel', defaultMessage: 'Discard Changes and Return to Learning Context', - description: 'Aria label for cancel button', + description: 'Screensaver label for cancel button', }, cancelButtonLabel: { id: 'authoring.editorfooter.cancelButton.label', @@ -17,11 +17,11 @@ export const messages = { saveButtonAriaLabel: { id: 'authoring.editorfooter.savebutton.ariaLabel', defaultMessage: 'Save Changes and Return to Learning Context', - description: 'Aria label for save button', + description: 'Screensaver label for save button', }, saveButtonLabel: { id: 'authoring.editorfooter.savebutton.label', - defaultMessage: 'Save Changes and Return to Learning Context', + defaultMessage: 'Save', description: 'Label for Save button', }, }; From 0d60cd97a00085f5c7fca2387ba82a35321cff0b Mon Sep 17 00:00:00 2001 From: Bernard Szabo Date: Mon, 11 Apr 2022 16:33:19 -0400 Subject: [PATCH 4/4] refactor: Fix footer aria descriptions 'screensaver' in Aria description messages changed to 'screen reader' --- src/editors/components/EditorFooter/messages.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/editors/components/EditorFooter/messages.js b/src/editors/components/EditorFooter/messages.js index 59b338ac7..26995d139 100644 --- a/src/editors/components/EditorFooter/messages.js +++ b/src/editors/components/EditorFooter/messages.js @@ -7,7 +7,7 @@ export const messages = { cancelButtonAriaLabel: { id: 'authoring.editorfooter.cancelButton.ariaLabel', defaultMessage: 'Discard Changes and Return to Learning Context', - description: 'Screensaver label for cancel button', + description: 'Screen reader label for cancel button', }, cancelButtonLabel: { id: 'authoring.editorfooter.cancelButton.label', @@ -17,7 +17,7 @@ export const messages = { saveButtonAriaLabel: { id: 'authoring.editorfooter.savebutton.ariaLabel', defaultMessage: 'Save Changes and Return to Learning Context', - description: 'Screensaver label for save button', + description: 'Screen reader label for save button', }, saveButtonLabel: { id: 'authoring.editorfooter.savebutton.label',