Merge branch 'develop' into arabic-animate-name

Author: Sarah Otts

package-lock.json

@@ -75,13 +75,13 @@
     "redux-throttle": "0.1.1",
     "scratch-audio": "0.1.0-prerelease.20200528195344",
     "scratch-blocks": "0.1.0-prerelease.20211110095305",
-    "scratch-l10n": "3.14.20211216031518",
+    "scratch-l10n": "3.14.20220102031517",
     "scratch-paint": "0.2.0-prerelease.20211027080909",
     "scratch-render": "0.1.0-prerelease.20211028200436",
     "scratch-render-fonts": "1.0.0-prerelease.20210401210003",
     "scratch-storage": "1.3.5",
     "scratch-svg-renderer": "0.2.0-prerelease.20210727023023",
-    "scratch-vm": "0.2.0-prerelease.20211216081552",
+    "scratch-vm": "0.2.0-prerelease.20220102085704",
     "startaudiocontext": "1.2.1",
     "style-loader": "^0.23.0",
     "text-encoding": "0.7.0",

package.json

@@ -30,6 +30,12 @@ const messages = defineMessages({
         description: 'A message that displays in a variable modal when the stage is selected indicating ' +
             'that the variable being created will available to all sprites.',
         id: 'gui.gui.variablePromptAllSpritesMessage'
+    },
+    listAvailableToAllSpritesMessage: {
+        defaultMessage: 'This list will be available to all sprites.',
+        description: 'A message that displays in a list modal when the stage is selected indicating ' +
+            'that the list being created will available to all sprites.',
+        id: 'gui.gui.listPromptAllSpritesMessage'
     }
 });
 
@@ -58,9 +64,15 @@ const PromptComponent = props => (
                 <div>
                     {props.isStage ?
                         <div className={styles.infoMessage}>
-                            <FormattedMessage
-                                {...messages.availableToAllSpritesMessage}
-                            />
+                            {props.showListMessage ? (
+                                <FormattedMessage
+                                    {...messages.listAvailableToAllSpritesMessage}
+                                />
+                            ) : (
+                                <FormattedMessage
+                                    {...messages.availableToAllSpritesMessage}
+                                />
+                            )}
                         </div> :
                         <Box className={styles.optionsRow}>
                             <label>
@@ -141,6 +153,7 @@ PromptComponent.propTypes = {
     defaultValue: PropTypes.string,
     globalSelected: PropTypes.bool.isRequired,
     isStage: PropTypes.bool.isRequired,
+    showListMessage: PropTypes.bool.isRequired,
     label: PropTypes.string.isRequired,
     onCancel: PropTypes.func.isRequired,
     onChange: PropTypes.func.isRequired,

src/components/prompt/prompt.jsx

@@ -544,6 +544,7 @@ class Blocks extends React.Component {
                     <Prompt
                         defaultValue={this.state.prompt.defaultValue}
                         isStage={vm.runtime.getEditingTarget().isStage}
+                        showListMessage={this.state.prompt.varType === this.ScratchBlocks.LIST_VARIABLE_TYPE}
                         label={this.state.prompt.message}
                         showCloudOption={this.state.prompt.showCloudOption}
                         showVariableOptions={this.state.prompt.showVariableOptions}

src/containers/blocks.jsx

@@ -60,6 +60,7 @@ class Prompt extends React.Component {
                 defaultValue={this.props.defaultValue}
                 globalSelected={this.state.globalSelected}
                 isStage={this.props.isStage}
+                showListMessage={this.props.showListMessage}
                 label={this.props.label}
                 showCloudOption={this.props.showCloudOption}
                 showVariableOptions={this.props.showVariableOptions}
@@ -79,6 +80,7 @@ class Prompt extends React.Component {
 Prompt.propTypes = {
     defaultValue: PropTypes.string,
     isStage: PropTypes.bool.isRequired,
+    showListMessage: PropTypes.bool.isRequired,
     label: PropTypes.string.isRequired,
     onCancel: PropTypes.func.isRequired,
     onOk: PropTypes.func.isRequired,