Skip to content

Commit b269264

Browse files
sbates-idrcsbates-idrc
committed
Merge branch 'develop-1.13' into language-selector
2 parents 99eb076 + 04f7187 commit b269264

32 files changed

Lines changed: 1147 additions & 504 deletions

‎docs/adding-new-world-checklist.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
`'All worlds should be displayed as options and only one is checked'`
2424
test in `WorldSelector.test.js` for the new world
2525
- Add entries to `messages.json`
26-
- `<WorldName>.name`: the name of the world
26+
- `UI.<WorldName>.name`: the name of the world
2727
- `<WorldName>.character`: the name of the character
2828
- `<WorldName>.label`: the label used for the world in the
2929
Scene Background dialog

‎src/ActionPanel.js‎

Lines changed: 85 additions & 58 deletions
Large diffs are not rendered by default.

‎src/ActionPanel.test.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function createMountActionPanel(props) {
2424
{},
2525
{
2626
focusedOptionName: null,
27-
selectedCommandName: 'right45',
27+
selectedActionName: 'right45',
2828
programSequence: new ProgramSequence(
2929
[
3030
{block: 'forward1'},
@@ -101,10 +101,10 @@ describe('ActionPanel options', () => {
101101
test('Given that there is no selected action, then the Replace button should be disabled', () => {
102102
const { wrapper } = createMountActionPanel({
103103
pressedStepIndex: 1,
104-
selectedCommandName: null
104+
selectedActionName: null
105105
});
106106
const replaceButton = getActionPanelOptionButtons(wrapper, 'replaceCurrentStep');
107-
const expectedAriaLabel = 'Replace Step 2 turn left 45 degrees ';
107+
const expectedAriaLabel = 'Replace Step 2 turn left 45 degrees';
108108
expect(replaceButton.get(0).props['aria-label']).toBe(expectedAriaLabel);
109109
expect(replaceButton.get(0).props['disabled']).toBe(true);
110110
});
@@ -127,7 +127,7 @@ describe('ActionPanel options', () => {
127127
pressedStepIndex: 0
128128
});
129129
const moveToPreviousStepButton = getActionPanelOptionButtons(wrapper, 'moveToPreviousStep');
130-
const expectedAriaLabel = 'Move Step 1 forward 1 square ';
130+
const expectedAriaLabel = 'Move Step 1 forward 1 square';
131131
expect(moveToPreviousStepButton.get(0).props['aria-label']).toBe(expectedAriaLabel);
132132
expect(moveToPreviousStepButton.get(0).props['disabled']).toBe(true);
133133
moveToPreviousStepButton.simulate('click');
@@ -150,7 +150,7 @@ describe('ActionPanel options', () => {
150150
pressedStepIndex: 0
151151
});
152152
const moveToPreviousStepButton = getActionPanelOptionButtons(wrapper, 'moveToPreviousStep');
153-
const expectedAriaLabel = "Move Step 1 loop A ";
153+
const expectedAriaLabel = "Move Step 1 loop A";
154154
expect(moveToPreviousStepButton.get(0).props['disabled']).toBe(true);
155155
moveToPreviousStepButton.simulate('click');
156156
expect(moveToPreviousStepButton.get(0).props['aria-label']).toBe(expectedAriaLabel);
@@ -173,7 +173,7 @@ describe('ActionPanel options', () => {
173173
pressedStepIndex: 2
174174
});
175175
const moveToPreviousStepButton = getActionPanelOptionButtons(wrapper, 'moveToPreviousStep');
176-
const expectedAriaLabel = "Move Step 3 loop A ";
176+
const expectedAriaLabel = "Move Step 3 loop A";
177177
expect(moveToPreviousStepButton.get(0).props['disabled']).toBe(true);
178178
moveToPreviousStepButton.simulate('click');
179179
expect(moveToPreviousStepButton.get(0).props['aria-label']).toBe(expectedAriaLabel);
@@ -328,7 +328,7 @@ describe('ActionPanel options', () => {
328328
pressedStepIndex: 2
329329
});
330330
const moveToNextStepButton = getActionPanelOptionButtons(wrapper, 'moveToNextStep');
331-
const expectedAriaLabel = 'Move Step 3 turn right 45 degrees ';
331+
const expectedAriaLabel = 'Move Step 3 turn right 45 degrees';
332332
expect(moveToNextStepButton.get(0).props['aria-label']).toBe(expectedAriaLabel);
333333
expect(moveToNextStepButton.get(0).props['disabled']).toBe(true);
334334
moveToNextStepButton.simulate('click');
@@ -351,7 +351,7 @@ describe('ActionPanel options', () => {
351351
pressedStepIndex: 0
352352
});
353353
const moveToNextStepButton = getActionPanelOptionButtons(wrapper, 'moveToNextStep');
354-
const expectedAriaLabel = "Move Step 1 loop A ";
354+
const expectedAriaLabel = "Move Step 1 loop A";
355355
expect(moveToNextStepButton.get(0).props['disabled']).toBe(true);
356356
moveToNextStepButton.simulate('click');
357357
expect(moveToNextStepButton.get(0).props['aria-label']).toBe(expectedAriaLabel);
@@ -374,7 +374,7 @@ describe('ActionPanel options', () => {
374374
pressedStepIndex: 2
375375
});
376376
const moveToNextStepButton = getActionPanelOptionButtons(wrapper, 'moveToNextStep');
377-
const expectedAriaLabel = "Move Step 3 loop A ";
377+
const expectedAriaLabel = "Move Step 3 loop A";
378378
expect(moveToNextStepButton.get(0).props['disabled']).toBe(true);
379379
moveToNextStepButton.simulate('click');
380380
expect(moveToNextStepButton.get(0).props['aria-label']).toBe(expectedAriaLabel);

‎src/ActionsMenuItem.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ export class ActionsMenuItem extends React.Component< ActionsMenuItemProps, {} >
3434

3535
render () {
3636
// We don't use FormattedMessage as we are working with a complex chain of templates.
37-
let commandName = this.props.intl.formatMessage({ id: `ActionsMenuItem.command.${this.props.itemKey}` });
38-
const usedLabel = this.props.intl.formatMessage({ id: 'ActionsMenuItem.usedItemToggleLabel' });
37+
let commandName = this.props.intl.formatMessage({ id: `UI.ActionsMenuItem.command.${this.props.itemKey}` });
38+
const usedLabel = this.props.intl.formatMessage({ id: 'UI.ActionsMenuItem.usedItemToggleLabel' });
3939
if (this.props.isUsed) {
4040
commandName += " " + usedLabel;
4141
}

‎src/ActionsSimplificationModal.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ class ActionsSimplificationModal extends React.Component<ActionsSimplificationMo
5454

5555
render() {
5656
const cancelButtonProperties = {
57-
label: this.props.intl.formatMessage({ id: 'ActionsSimplificationModal.cancel'} ),
57+
label: this.props.intl.formatMessage({ id: 'UI.Cancel'} ),
5858
isPrimary: false,
5959
onClick: this.handleOnCancel
6060
};
6161
const saveButtonProperties = {
6262
id: 'ActionSimplificationModal-done',
6363
isPrimary: true,
64-
label: this.props.intl.formatMessage({ id: 'ActionsSimplificationModal.save'} ),
64+
label: this.props.intl.formatMessage({ id: 'UI.Save'} ),
6565
onClick: this.saveChanges
6666
};
6767
return (
@@ -75,14 +75,14 @@ class ActionsSimplificationModal extends React.Component<ActionsSimplificationMo
7575
>
7676
<ModalHeader
7777
id='ActionsSimplificationModal__header'
78-
title={this.props.intl.formatMessage({ id: 'ActionsSimplificationModal.title'})}
78+
title={this.props.intl.formatMessage({ id: 'UI.ActionsSimplificationModal.title'})}
7979
>
8080
<SimplificationIcon aria-hidden='true'/>
8181
</ModalHeader>
8282

8383
<ModalBody>
8484
<h3 className='ActionsSimplificationModal__section-heading'>
85-
<FormattedMessage id="CommandPalette.movementsTitle"/>
85+
<FormattedMessage id="UI.CommandPalette.movementsTitle"/>
8686
</h3>
8787

8888
<div className='ActionsSimplificationModal__section'>
@@ -91,7 +91,7 @@ class ActionsSimplificationModal extends React.Component<ActionsSimplificationMo
9191

9292

9393
<h3 className='ActionsSimplificationModal__section-heading'>
94-
<FormattedMessage id="CommandPalette.controlsTitle"/>
94+
<FormattedMessage id="UI.CommandPalette.controlsTitle"/>
9595
</h3>
9696

9797
<div className='ActionsSimplificationModal__section'>

‎src/AnnouncementBuilder.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,43 +10,43 @@ type AnnouncementData = {|
1010

1111
export default class AnnouncementBuilder {
1212
buildSelectActionAnnouncement(action: string, intl: IntlShape): AnnouncementData {
13-
let commandType = null;
13+
let actionType = null;
1414
if (action === 'loop') {
15-
commandType = intl.formatMessage({
15+
actionType = intl.formatMessage({
1616
id: 'Announcement.control'
1717
});
1818
} else {
19-
commandType = intl.formatMessage({
19+
actionType = intl.formatMessage({
2020
id: 'Announcement.movement'
2121
});
2222
}
2323
return {
2424
messageIdSuffix: 'actionSelected',
2525
values: {
26-
commandType: commandType,
27-
command: intl.formatMessage({
26+
actionType,
27+
actionName: intl.formatMessage({
2828
id: `Announcement.${action}`
2929
}),
3030
}
3131
};
3232
}
3333

3434
buildAddStepAnnouncement(action: string, intl: IntlShape): AnnouncementData {
35-
let commandType = null;
35+
let actionType = null;
3636
if (action === 'loop') {
37-
commandType = intl.formatMessage({
37+
actionType = intl.formatMessage({
3838
id: 'Announcement.control'
3939
});
4040
} else {
41-
commandType = intl.formatMessage({
41+
actionType = intl.formatMessage({
4242
id: 'Announcement.movement'
4343
});
4444
}
4545
return {
4646
messageIdSuffix: 'add',
4747
values: {
48-
commandType: commandType,
49-
command: intl.formatMessage({
48+
actionType,
49+
actionName: intl.formatMessage({
5050
id: `Announcement.${action}`
5151
}),
5252
}
@@ -58,10 +58,10 @@ export default class AnnouncementBuilder {
5858
return {
5959
messageIdSuffix: 'delete',
6060
values: {
61-
commandType: intl.formatMessage({
61+
actionType: intl.formatMessage({
6262
id: "Announcement.control"
6363
}),
64-
command: intl.formatMessage(
64+
actionName: intl.formatMessage(
6565
{
6666
id: `Announcement.${programBlock.block}`
6767
},
@@ -75,10 +75,10 @@ export default class AnnouncementBuilder {
7575
return {
7676
messageIdSuffix: 'delete',
7777
values: {
78-
commandType: intl.formatMessage({
78+
actionType: intl.formatMessage({
7979
id: "Announcement.movement"
8080
}),
81-
command: intl.formatMessage(
81+
actionName: intl.formatMessage(
8282
{
8383
id: `Announcement.${programBlock.block}`
8484
}
@@ -94,10 +94,10 @@ export default class AnnouncementBuilder {
9494
return {
9595
messageIdSuffix: 'replace',
9696
values: {
97-
oldCommand: intl.formatMessage({
97+
oldActionName: intl.formatMessage({
9898
id: `Announcement.${programBlock.block}`
9999
}),
100-
newCommand: intl.formatMessage({
100+
newActionName: intl.formatMessage({
101101
id: `Announcement.${selectedAction}`
102102
})
103103
}

‎src/AnnouncementBuilder.test.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ test('Test buildSelectActionAnnouncement()', () => {
1818
expect(announcementBuilder.buildSelectActionAnnouncement('loop', intl)).toStrictEqual({
1919
messageIdSuffix: 'actionSelected',
2020
values: {
21-
commandType: 'control',
22-
command: 'loop'
21+
actionType: 'control',
22+
actionName: 'loop'
2323
}
2424
});
2525

2626
expect(announcementBuilder.buildSelectActionAnnouncement('forward1', intl)).toStrictEqual({
2727
messageIdSuffix: 'actionSelected',
2828
values: {
29-
commandType: 'movement',
30-
command: 'forward 1 square'
29+
actionType: 'movement',
30+
actionName: 'forward 1 square'
3131
}
3232
});
3333
});
@@ -40,16 +40,16 @@ test('Test buildAddStepAnnouncement()', () => {
4040
expect(announcementBuilder.buildAddStepAnnouncement('loop', intl)).toStrictEqual({
4141
messageIdSuffix: 'add',
4242
values: {
43-
commandType: 'control',
44-
command: 'loop'
43+
actionType: 'control',
44+
actionName: 'loop'
4545
}
4646
});
4747

4848
expect(announcementBuilder.buildAddStepAnnouncement('forward1', intl)).toStrictEqual({
4949
messageIdSuffix: 'add',
5050
values: {
51-
commandType: 'movement',
52-
command: 'forward 1 square'
51+
actionType: 'movement',
52+
actionName: 'forward 1 square'
5353
}
5454
});
5555
});
@@ -67,8 +67,8 @@ describe('Test buildDeleteStepAnnouncement()', () => {
6767
expect(announcementBuilder.buildDeleteStepAnnouncement(startLoopBlock, intl)).toStrictEqual({
6868
messageIdSuffix: 'delete',
6969
values: {
70-
commandType: 'control',
71-
command: 'loop A'
70+
actionType: 'control',
71+
actionName: 'loop A'
7272
}
7373
});
7474
});
@@ -84,8 +84,8 @@ describe('Test buildDeleteStepAnnouncement()', () => {
8484
expect(announcementBuilder.buildDeleteStepAnnouncement(endLoopBlock, intl)).toStrictEqual({
8585
messageIdSuffix: 'delete',
8686
values: {
87-
commandType: 'control',
88-
command: 'loop A'
87+
actionType: 'control',
88+
actionName: 'loop A'
8989
}
9090
});
9191
});
@@ -100,8 +100,8 @@ describe('Test buildDeleteStepAnnouncement()', () => {
100100
expect(announcementBuilder.buildDeleteStepAnnouncement(forwardBlock, intl)).toStrictEqual({
101101
messageIdSuffix: 'delete',
102102
values: {
103-
commandType: 'movement',
104-
command: 'forward 1 square'
103+
actionType: 'movement',
104+
actionName: 'forward 1 square'
105105
}
106106
});
107107
});
@@ -119,8 +119,8 @@ test('Test buildReplaceStepAnnouncement()', () => {
119119
expect(announcementBuilder.buildReplaceStepAnnouncement(forwardBlock, 'right45', intl)).toStrictEqual({
120120
messageIdSuffix: 'replace',
121121
values: {
122-
oldCommand: 'forward 1 square',
123-
newCommand: 'turn right 45 degrees'
122+
oldActionName: 'forward 1 square',
123+
newActionName: 'turn right 45 degrees'
124124
}
125125
});
126126
});

‎src/App.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ export class App extends React.Component<AppProps, AppState> {
267267
});
268268
}
269269

270-
getSelectedCommandName() {
270+
getSelectedActionName() {
271271
if (this.state.selectedAction !== null) {
272272
return this.state.selectedAction;
273273
} else {
@@ -973,7 +973,7 @@ export class App extends React.Component<AppProps, AppState> {
973973
<CommandPaletteCommand
974974
key={`CommandBlock-${index}`}
975975
commandName={value}
976-
selectedCommandName={this.getSelectedCommandName()}
976+
selectedActionName={this.getSelectedActionName()}
977977
audioManager={this.audioManager}
978978
isDraggingCommand={this.state.isDraggingCommand}
979979
onSelect={this.handleCommandFromCommandPalette}
@@ -1285,13 +1285,13 @@ export class App extends React.Component<AppProps, AppState> {
12851285
className="App__PrivacyModal__toggle-button"
12861286
onClick={this.handleClickPrivacyButton}
12871287
>
1288-
<FormattedMessage id='App.privacyModalToggle'/>
1288+
<FormattedMessage id='UI.App.privacyModalToggle'/>
12891289
</button>
12901290
</div>
12911291
<div className='App__header-menu'>
12921292
<IconButton
12931293
className="App__header-soundOptions"
1294-
ariaLabel={this.props.intl.formatMessage({ id: 'SoundOptionsModal.title' })}
1294+
ariaLabel={this.props.intl.formatMessage({ id: 'UI.SoundOptionsModal.title' })}
12951295
onClick={this.handleClickSoundIcon}
12961296
>
12971297
<AudioIcon
@@ -1440,14 +1440,14 @@ export class App extends React.Component<AppProps, AppState> {
14401440
<React.Fragment>
14411441
<div className='App__ActionsMenu__header'>
14421442
<h2 className='App__ActionsMenu__header-heading'>
1443-
<FormattedMessage id='ActionsMenu.title' />
1443+
<FormattedMessage id='UI.ActionsMenu.title' />
14441444
</h2>
14451445
</div>
14461446
<div className='App__command-palette-command-container'>
14471447
<div className='App__command-palette-section'>
14481448
<div className='App__command-palette-section-heading-container'>
14491449
<h3 className='App__command-palette-section-heading'>
1450-
<FormattedMessage id='CommandPalette.movementsTitle'/>
1450+
<FormattedMessage id='UI.CommandPalette.movementsTitle'/>
14511451
</h3>
14521452
</div>
14531453
<div className='App__command-palette-section-body'>
@@ -1472,7 +1472,7 @@ export class App extends React.Component<AppProps, AppState> {
14721472
<div className='App__command-palette-section'>
14731473
<div className='App__command-palette-section-heading-container'>
14741474
<h3 className='App__command-palette-section-heading'>
1475-
<FormattedMessage id='CommandPalette.controlsTitle'/>
1475+
<FormattedMessage id='UI.CommandPalette.controlsTitle'/>
14761476
</h3>
14771477
</div>
14781478

@@ -1565,7 +1565,7 @@ export class App extends React.Component<AppProps, AppState> {
15651565
aria-hidden={true}
15661566
/>
15671567
<div className='App__ShareButton__label'>
1568-
{this.props.intl.formatMessage({id:'ShareButton'})}
1568+
{this.props.intl.formatMessage({id:'UI.ShareButton'})}
15691569
</div>
15701570
</button>
15711571
</div>

0 commit comments

Comments
 (0)