add: new messages file with French translations

src/ActionPanel.test.js

@@ -24,7 +24,7 @@ function createMountActionPanel(props) {
                 {},
                 {
                     focusedOptionName: null,
-                    selectedCommandName: 'right45',
+                    selectedActionName: 'right45',
                     programSequence: new ProgramSequence(
                         [
                             {block: 'forward1'},
@@ -101,10 +101,10 @@ describe('ActionPanel options', () => {
     test('Given that there is no selected action, then the Replace button should be disabled', () => {
         const { wrapper } = createMountActionPanel({
             pressedStepIndex: 1,
-            selectedCommandName: null
+            selectedActionName: null
         });
         const replaceButton = getActionPanelOptionButtons(wrapper, 'replaceCurrentStep');
-        const expectedAriaLabel = 'Replace Step 2 turn left 45 degrees ';
+        const expectedAriaLabel = 'Replace Step 2 turn left 45 degrees';
         expect(replaceButton.get(0).props['aria-label']).toBe(expectedAriaLabel);
         expect(replaceButton.get(0).props['disabled']).toBe(true);
     });
@@ -127,7 +127,7 @@ describe('ActionPanel options', () => {
             pressedStepIndex: 0
         });
         const moveToPreviousStepButton = getActionPanelOptionButtons(wrapper, 'moveToPreviousStep');
-        const expectedAriaLabel = 'Move Step 1 forward 1 square ';
+        const expectedAriaLabel = 'Move Step 1 forward 1 square';
         expect(moveToPreviousStepButton.get(0).props['aria-label']).toBe(expectedAriaLabel);
         expect(moveToPreviousStepButton.get(0).props['disabled']).toBe(true);
         moveToPreviousStepButton.simulate('click');
@@ -150,7 +150,7 @@ describe('ActionPanel options', () => {
             pressedStepIndex: 0
         });
         const moveToPreviousStepButton = getActionPanelOptionButtons(wrapper, 'moveToPreviousStep');
-        const expectedAriaLabel = "Move Step 1 loop A ";
+        const expectedAriaLabel = "Move Step 1 loop A";
         expect(moveToPreviousStepButton.get(0).props['disabled']).toBe(true);
         moveToPreviousStepButton.simulate('click');
         expect(moveToPreviousStepButton.get(0).props['aria-label']).toBe(expectedAriaLabel);
@@ -173,7 +173,7 @@ describe('ActionPanel options', () => {
             pressedStepIndex: 2
         });
         const moveToPreviousStepButton = getActionPanelOptionButtons(wrapper, 'moveToPreviousStep');
-        const expectedAriaLabel = "Move Step 3 loop A ";
+        const expectedAriaLabel = "Move Step 3 loop A";
         expect(moveToPreviousStepButton.get(0).props['disabled']).toBe(true);
         moveToPreviousStepButton.simulate('click');
         expect(moveToPreviousStepButton.get(0).props['aria-label']).toBe(expectedAriaLabel);
@@ -328,7 +328,7 @@ describe('ActionPanel options', () => {
             pressedStepIndex: 2
         });
         const moveToNextStepButton = getActionPanelOptionButtons(wrapper, 'moveToNextStep');
-        const expectedAriaLabel = 'Move Step 3 turn right 45 degrees ';
+        const expectedAriaLabel = 'Move Step 3 turn right 45 degrees';
         expect(moveToNextStepButton.get(0).props['aria-label']).toBe(expectedAriaLabel);
         expect(moveToNextStepButton.get(0).props['disabled']).toBe(true);
         moveToNextStepButton.simulate('click');
@@ -351,7 +351,7 @@ describe('ActionPanel options', () => {
             pressedStepIndex: 0
         });
         const moveToNextStepButton = getActionPanelOptionButtons(wrapper, 'moveToNextStep');
-        const expectedAriaLabel = "Move Step 1 loop A ";
+        const expectedAriaLabel = "Move Step 1 loop A";
         expect(moveToNextStepButton.get(0).props['disabled']).toBe(true);
         moveToNextStepButton.simulate('click');
         expect(moveToNextStepButton.get(0).props['aria-label']).toBe(expectedAriaLabel);
@@ -374,7 +374,7 @@ describe('ActionPanel options', () => {
             pressedStepIndex: 2
         });
         const moveToNextStepButton = getActionPanelOptionButtons(wrapper, 'moveToNextStep');
-        const expectedAriaLabel = "Move Step 3 loop A ";
+        const expectedAriaLabel = "Move Step 3 loop A";
         expect(moveToNextStepButton.get(0).props['disabled']).toBe(true);
         moveToNextStepButton.simulate('click');
         expect(moveToNextStepButton.get(0).props['aria-label']).toBe(expectedAriaLabel);

src/ActionsSimplificationModal.js

@@ -54,14 +54,14 @@ class ActionsSimplificationModal extends React.Component<ActionsSimplificationMo
 
     render() {
         const cancelButtonProperties = {
-            label: this.props.intl.formatMessage({ id: 'ActionsSimplificationModal.cancel'} ),
+            label: this.props.intl.formatMessage({ id: 'Cancel'} ),
             isPrimary: false,
             onClick: this.handleOnCancel
         };
         const saveButtonProperties = {
             id: 'ActionSimplificationModal-done',
             isPrimary: true,
-            label: this.props.intl.formatMessage({ id: 'ActionsSimplificationModal.save'} ),
+            label: this.props.intl.formatMessage({ id: 'Save'} ),
             onClick: this.saveChanges
         };
         return (

src/AnnouncementBuilder.js

@@ -16,43 +16,43 @@ export default class AnnouncementBuilder {
     }
 
     buildSelectActionAnnouncement(action: string): AnnouncementData {
-        let commandType = null;
+        let actionType = null;
         if (action === 'loop') {
-            commandType = this.intl.formatMessage({
+            actionType = this.intl.formatMessage({
                 id: 'Announcement.control'
             });
         } else {
-            commandType = this.intl.formatMessage({
+            actionType = this.intl.formatMessage({
                 id: 'Announcement.movement'
             });
         }
         return {
             messageIdSuffix: 'actionSelected',
             values: {
-                commandType: commandType,
-                command: this.intl.formatMessage({
+                actionType,
+                actionName: this.intl.formatMessage({
                     id: `Announcement.${action}`
                 }),
             }
         };
     }
 
     buildAddStepAnnouncement(action: string): AnnouncementData {
-        let commandType = null;
+        let actionType = null;
         if (action === 'loop') {
-            commandType = this.intl.formatMessage({
+            actionType = this.intl.formatMessage({
                 id: 'Announcement.control'
             });
         } else {
-            commandType = this.intl.formatMessage({
+            actionType = this.intl.formatMessage({
                 id: 'Announcement.movement'
             });
         }
         return {
             messageIdSuffix: 'add',
             values: {
-                commandType: commandType,
-                command: this.intl.formatMessage({
+                actionType,
+                actionName: this.intl.formatMessage({
                     id: `Announcement.${action}`
                 }),
             }
@@ -64,10 +64,10 @@ export default class AnnouncementBuilder {
             return {
                 messageIdSuffix: 'delete',
                 values: {
-                    commandType: this.intl.formatMessage({
+                    actionType: this.intl.formatMessage({
                         id: "Announcement.control"
                     }),
-                    command: this.intl.formatMessage(
+                    actionName: this.intl.formatMessage(
                         {
                             id: `Announcement.${programBlock.block}`
                         },
@@ -81,10 +81,10 @@ export default class AnnouncementBuilder {
             return {
                 messageIdSuffix: 'delete',
                 values: {
-                    commandType: this.intl.formatMessage({
+                    actionType: this.intl.formatMessage({
                         id: "Announcement.movement"
                     }),
-                    command: this.intl.formatMessage(
+                    actionName: this.intl.formatMessage(
                         {
                             id: `Announcement.${programBlock.block}`
                         }
@@ -100,10 +100,10 @@ export default class AnnouncementBuilder {
         return {
             messageIdSuffix: 'replace',
             values: {
-                oldCommand: this.intl.formatMessage({
+                oldActionName: this.intl.formatMessage({
                     id: `Announcement.${programBlock.block}`
                 }),
-                newCommand: this.intl.formatMessage({
+                newActionName: this.intl.formatMessage({
                     id: `Announcement.${selectedAction}`
                 })
             }

src/AnnouncementBuilder.test.js

@@ -22,16 +22,16 @@ test('Test buildSelectActionAnnouncement()', () => {
     expect(announcementBuilder.buildSelectActionAnnouncement('loop')).toStrictEqual({
         messageIdSuffix: 'actionSelected',
         values: {
-            commandType: 'control',
-            command: 'loop'
+            actionType: 'control',
+            actionName: 'loop'
         }
     });
 
     expect(announcementBuilder.buildSelectActionAnnouncement('forward1')).toStrictEqual({
         messageIdSuffix: 'actionSelected',
         values: {
-            commandType: 'movement',
-            command: 'forward 1 square'
+            actionType: 'movement',
+            actionName: 'forward 1 square'
         }
     });
 });
@@ -44,16 +44,16 @@ test('Test buildAddStepAnnouncement()', () => {
     expect(announcementBuilder.buildAddStepAnnouncement('loop')).toStrictEqual({
         messageIdSuffix: 'add',
         values: {
-            commandType: 'control',
-            command: 'loop'
+            actionType: 'control',
+            actionName: 'loop'
         }
     });
 
     expect(announcementBuilder.buildAddStepAnnouncement('forward1')).toStrictEqual({
         messageIdSuffix: 'add',
         values: {
-            commandType: 'movement',
-            command: 'forward 1 square'
+            actionType: 'movement',
+            actionName: 'forward 1 square'
         }
     });
 });
@@ -71,8 +71,8 @@ describe('Test buildDeleteStepAnnouncement()', () => {
         expect(announcementBuilder.buildDeleteStepAnnouncement(startLoopBlock)).toStrictEqual({
             messageIdSuffix: 'delete',
             values: {
-                commandType: 'control',
-                command: 'loop A'
+                actionType: 'control',
+                actionName: 'loop A'
             }
         });
     });
@@ -88,8 +88,8 @@ describe('Test buildDeleteStepAnnouncement()', () => {
         expect(announcementBuilder.buildDeleteStepAnnouncement(endLoopBlock)).toStrictEqual({
             messageIdSuffix: 'delete',
             values: {
-                commandType: 'control',
-                command: 'loop A'
+                actionType: 'control',
+                actionName: 'loop A'
             }
         });
     });
@@ -104,8 +104,8 @@ describe('Test buildDeleteStepAnnouncement()', () => {
         expect(announcementBuilder.buildDeleteStepAnnouncement(forwardBlock)).toStrictEqual({
             messageIdSuffix: 'delete',
             values: {
-                commandType: 'movement',
-                command: 'forward 1 square'
+                actionType: 'movement',
+                actionName: 'forward 1 square'
             }
         });
     });
@@ -123,8 +123,8 @@ test('Test buildReplaceStepAnnouncement()', () => {
     expect(announcementBuilder.buildReplaceStepAnnouncement(forwardBlock, 'right45')).toStrictEqual({
         messageIdSuffix: 'replace',
         values: {
-            oldCommand: 'forward 1 square',
-            newCommand: 'turn right 45 degrees'
+            oldActionName: 'forward 1 square',
+            newActionName: 'turn right 45 degrees'
         }
     });
 });

src/App.js

@@ -285,7 +285,7 @@ export class App extends React.Component<AppProps, AppState> {
         });
     }
 
-    getSelectedCommandName() {
+    getSelectedActionName() {
         if (this.state.selectedAction !== null) {
             return this.state.selectedAction;
         } else {
@@ -1013,7 +1013,7 @@ export class App extends React.Component<AppProps, AppState> {
                     <CommandPaletteCommand
                         key={`CommandBlock-${index}`}
                         commandName={value}
-                        selectedCommandName={this.getSelectedCommandName()}
+                        selectedActionName={this.getSelectedActionName()}
                         audioManager={this.audioManager}
                         isDraggingCommand={this.state.isDraggingCommand}
                         onSelect={this.handleCommandFromCommandPalette}

src/App.test.js

@@ -56,16 +56,16 @@ it('renders without crashing', () => {
     ReactDOM.unmountComponentAtNode(div);
 });
 
-it('Should play a sound when selectedCommandName changes', () => {
+it('Should play a sound when selectedActionName changes', () => {
     const { app, audioManagerMock } = mountApp({});
 
     // Update the selectedAction
     app.setState({ selectedAction: "forward1"}, function () {
         expect(audioManagerMock.playAnnouncement.mock.calls.length).toBe(1);
         expect(audioManagerMock.playAnnouncement.mock.calls[0][0]).toBe('actionSelected');
         expect(audioManagerMock.playAnnouncement.mock.calls[0][2]).toStrictEqual({
-            "commandType": "movement",
-            "command": "forward 1 square"
+            "actionType": "movement",
+            "actionName": "forward 1 square"
         });
     });
 });

src/CharacterAriaLive.js

@@ -40,7 +40,7 @@ class CharacterAriaLive extends React.Component<CharacterAriaLiveProps, {}> {
         });
         const text = this.props.intl.formatMessage(
             { id:'CharacterAriaLive.movementAriaLabel' },
-            { character: characterLabel }
+            { sceneCharacter: characterLabel }
         );
         this.setLiveRegion(text);
     }

src/CharacterDescriptionBuilder.js

@@ -38,7 +38,7 @@ export default class CharacterDescriptionBuilder {
                 {
                     columnLabel: columnLabel,
                     rowLabel: rowLabel,
-                    item: itemLabel,
+                    backgroundItem: itemLabel,
                     direction: directionLabel
                 }
             );

src/CommandPaletteCommand.js

@@ -12,7 +12,7 @@ type CommandPaletteCommandProps = {
     commandName: CommandName,
     intl: IntlShape,
     isDraggingCommand: boolean,
-    selectedCommandName: ?CommandName,
+    selectedActionName: ?CommandName,
     onSelect: (commandName: CommandName) => void,
     onDragStart: (commandName: CommandName) => void,
     onDragEnd: () => void
@@ -34,7 +34,7 @@ class CommandPaletteCommand extends React.Component<CommandPaletteCommandProps,
     };
 
     render() {
-        const pressed = this.props.commandName === this.props.selectedCommandName && !this.props.isDraggingCommand;
+        const pressed = this.props.commandName === this.props.selectedActionName && !this.props.isDraggingCommand;
 
         const classes = classNames(
             {'command-block--pressed' : pressed},

src/CommandPaletteCommand.test.js

@@ -31,7 +31,7 @@ test('Pressed state is false when selecedCommandName is null', () => {
         <CommandPaletteCommand.WrappedComponent
             intl={intl}
             commandName='forward1'
-            selectedCommandName={null}
+            selectedActionName={null}
             onSelect={() => {}}/>
     );
     expect(hasPressedClass(wrapper)).toBe(false);
@@ -43,7 +43,7 @@ test('Pressed state is false when selecedCommandName is another command', () =>
         <CommandPaletteCommand.WrappedComponent
             intl={intl}
             commandName='forward1'
-            selectedCommandName='left45'
+            selectedActionName='left45'
             onSelect={() => {}}/>
     );
     expect(hasPressedClass(wrapper)).toBe(false);
@@ -55,7 +55,7 @@ test('Pressed state is true when selecedCommandName is this command', () => {
         <CommandPaletteCommand.WrappedComponent
             intl={intl}
             commandName='forward1'
-            selectedCommandName='forward1'
+            selectedActionName='forward1'
             onSelect={() => {}}/>
     );
     expect(hasPressedClass(wrapper)).toBe(true);
@@ -69,7 +69,7 @@ test('Clicking the button calls the callback onSelect with commandName', () => {
         <CommandPaletteCommand.WrappedComponent
             intl={intl}
             commandName='forward1'
-            selectedCommandName={null}
+            selectedActionName={null}
             onSelect={mockSelectHandler}/>
     );
 
@@ -80,8 +80,8 @@ test('Clicking the button calls the callback onSelect with commandName', () => {
     // Verify that onSelect is called with the commandName
     expect(mockSelectHandler.mock.calls.length).toBe(1);
     expect(mockSelectHandler.mock.calls[0][0]).toBe('forward1');
-    // Update the selectedCommandName
-    wrapper.setProps({selectedCommandName: 'forward1'});
+    // Update the selectedActionName
+    wrapper.setProps({selectedActionName: 'forward1'});
     wrapper.update();
     // Click again
     button.simulate('click');