fix: update based on PR feedback

Author: chosww

src/ActionPanel.js

@@ -110,7 +110,7 @@ class ActionPanel extends React.Component<ActionPanelProps, {}> {
                     }
                 // When previous step is wrapped in a loop, aria-label communicates position within a loop
                 } else if (cachedPreviousStepLoopData != null) {
-                    return this.props.intl.formatMessage({id: 'ActionPanel.action.moveToPreviousStep.withInLoop'},
+                    return this.props.intl.formatMessage({id: 'ActionPanel.action.moveToPreviousStep.withinLoop'},
                         {
                             stepNumber,
                             stepActionName,
@@ -181,7 +181,7 @@ class ActionPanel extends React.Component<ActionPanelProps, {}> {
                     }
                 // When next step is wrapped in a loop, aria-label communicates position within a loop
                 } else if (cachedNextStepLoopData != null) {
-                    return this.props.intl.formatMessage({id: 'ActionPanel.action.moveToNextStep.withInLoop'},
+                    return this.props.intl.formatMessage({id: 'ActionPanel.action.moveToNextStep.withinLoop'},
                         {
                             stepNumber,
                             stepActionName,

src/ProgramChangeController.test.js

@@ -196,7 +196,7 @@ type DeleteStepTestCase = {
     deleteStepIndex: number,
     deleteStepName: string,
     expectedAnnouncementActionType: string,
-    expectedAnnouncementAction: string
+    expectedAnnouncementActionName: string
 };
 
 describe('Test deleteProgramStep()', () => {
@@ -209,7 +209,7 @@ describe('Test deleteProgramStep()', () => {
             deleteStepIndex: 0,
             deleteStepName: 'forward1',
             expectedAnnouncementActionType: 'movement',
-            expectedAnnouncementAction: 'forward 1 square'
+            expectedAnnouncementActionName: 'forward 1 square'
         },
         {
             program: [
@@ -220,7 +220,7 @@ describe('Test deleteProgramStep()', () => {
             deleteStepIndex: 0,
             deleteStepName: 'startLoop',
             expectedAnnouncementActionType: 'control',
-            expectedAnnouncementAction: 'loop A'
+            expectedAnnouncementActionName: 'loop A'
         },
         {
             program: [
@@ -231,7 +231,7 @@ describe('Test deleteProgramStep()', () => {
             deleteStepIndex: 1,
             deleteStepName: 'endLoop',
             expectedAnnouncementActionType: 'control',
-            expectedAnnouncementAction: 'loop A'
+            expectedAnnouncementActionName: 'loop A'
         }
     ]: Array<DeleteStepTestCase>))('When deleting a step not at the end, then focus is set to the step now at the deleted index',
         (testData: DeleteStepTestCase, done) => {
@@ -253,7 +253,7 @@ describe('Test deleteProgramStep()', () => {
                 expect(audioManagerMock.playAnnouncement.mock.calls[0][0]).toBe('delete');
                 expect(audioManagerMock.playAnnouncement.mock.calls[0][2]).toStrictEqual({
                     actionType: testData.expectedAnnouncementActionType,
-                    actionName: testData.expectedAnnouncementAction
+                    actionName: testData.expectedAnnouncementActionName
                 });
 
                 // The add-node after the program should be focused
@@ -281,7 +281,7 @@ describe('Test deleteProgramStep()', () => {
             deleteStepIndex: 1,
             deleteStepName: 'forward2',
             expectedAnnouncementActionType: 'movement',
-            expectedAnnouncementAction: 'forward 2 squares'
+            expectedAnnouncementActionName: 'forward 2 squares'
         },
         {
             program: [
@@ -292,7 +292,7 @@ describe('Test deleteProgramStep()', () => {
             deleteStepIndex: 1,
             deleteStepName: 'startLoop',
             expectedAnnouncementActionType: 'control',
-            expectedAnnouncementAction: 'loop A'
+            expectedAnnouncementActionName: 'loop A'
         },
         {
             program: [
@@ -303,7 +303,7 @@ describe('Test deleteProgramStep()', () => {
             deleteStepIndex: 2,
             deleteStepName: 'endLoop',
             expectedAnnouncementActionType: 'control',
-            expectedAnnouncementAction: 'loop A'
+            expectedAnnouncementActionName: 'loop A'
         }
     ]: Array<DeleteStepTestCase>))('When deleting the step at the end, then focus is set to the add-node after the program',
         (testData: DeleteStepTestCase, done) => {
@@ -325,7 +325,7 @@ describe('Test deleteProgramStep()', () => {
                 expect(audioManagerMock.playAnnouncement.mock.calls[0][0]).toBe('delete');
                 expect(audioManagerMock.playAnnouncement.mock.calls[0][2]).toStrictEqual({
                     actionType: testData.expectedAnnouncementActionType,
-                    actionName: testData.expectedAnnouncementAction
+                    actionName: testData.expectedAnnouncementActionName
                 });
 
                 // The add-node after the program should be focused

src/messages.json

@@ -4,12 +4,12 @@
         "ActionPanel.action.moveToNextStep": "Move Step {stepNumber} {stepActionName} after step {nextStepNumber} {nextStepActionName}",
         "ActionPanel.action.moveToNextStep.disabled": "Move Step {stepNumber} {stepActionName}",
         "ActionPanel.action.moveToNextStep.outOfLoop": "Move Step {stepNumber} {stepActionName} out of loop {loopLabel}",
-        "ActionPanel.action.moveToNextStep.withInLoop": "Move Step {stepNumber} {stepActionName} after step {nextStepNumber} {nextStepActionName} of loop {loopLabel}",
+        "ActionPanel.action.moveToNextStep.withinLoop": "Move Step {stepNumber} {stepActionName} after step {nextStepNumber} {nextStepActionName} of loop {loopLabel}",
         "ActionPanel.action.moveToNextStep.intoLoop": "Move Step {stepNumber} {stepActionName} into loop {loopLabel}",
         "ActionPanel.action.moveToPreviousStep": "Move Step {stepNumber} {stepActionName} before step {previousStepNumber} {previousStepActionName}",
         "ActionPanel.action.moveToPreviousStep.disabled": "Move Step {stepNumber} {stepActionName}",
         "ActionPanel.action.moveToPreviousStep.intoLoop": "Move Step {stepNumber} {stepActionName} into loop {loopLabel}",
-        "ActionPanel.action.moveToPreviousStep.withInLoop": "Move Step {stepNumber} {stepActionName} before step {previousStepNumber} {previousStepActionName} of loop {loopLabel}",
+        "ActionPanel.action.moveToPreviousStep.withinLoop": "Move Step {stepNumber} {stepActionName} before step {previousStepNumber} {previousStepActionName} of loop {loopLabel}",
         "ActionPanel.action.moveToPreviousStep.outOfLoop": "Move Step {stepNumber} {stepActionName} out of loop {loopLabel}",
         "ActionPanel.action.replace.noSelectedAction": "Replace Step {stepNumber} {stepActionName}",
         "ActionPanel.action.replace.withSelectedAction": "Replace Step {stepNumber} {stepActionName} with selected action {selectedActionName}",
@@ -952,7 +952,7 @@
         "Savannah.pond": "l'étang",
         "Savannah.tree": "l'arbre",
         "Save": "Sauvegarder",
-        "Scene.description": "Scène, dans {world}, grille {numColumns} par {numRows}. {characterDescription}",
+        "Scene.description": "Scène, dans {backgroundName}, grille {numColumns} par {numRows}. {characterDescription}",
         "Scene.heading": "scène",
         "SceneMessage.close": "fermée le message",
         "ShareButton": "partager",