Merge branch 'develop' into patch-4

src/components/browser-modal/browser-modal.jsx

@@ -60,12 +60,12 @@ const BrowserModal = ({intl, ...props}) => (
                         previewFaqLink: (
                             <a
                                 className={styles.faqLink}
-                                href="//scratch.mit.edu/preview-faq"
+                                href="//scratch.mit.edu/3faq"
                             >
                                 <FormattedMessage
-                                    defaultMessage="Preview FAQ"
-                                    description="link to Scratch 3.0 preview FAQ page"
-                                    id="gui.unsupportedBrowser.previewfaqlink"
+                                    defaultMessage="FAQ"
+                                    description="link to Scratch 3.0 FAQ page"
+                                    id="gui.unsupportedBrowser.previewfaqlinktext"
                                 />
                             </a>
                         )

src/components/import-modal/import-modal.jsx

@@ -16,6 +16,12 @@ const messages = defineMessages({
         description: 'Scratch 2.0 import modal label - for accessibility'
     },
     formDescription: {
+        defaultMessage:
+            'Enter a link to one of your shared Scratch projects. Changes made in this 3.0 Beta will not be saved.',
+        description: 'Import project message',
+        id: 'gui.importInfo.betamessage'
+    },
+    previewFormDescription: {
         defaultMessage:
             'Enter a link to one of your shared Scratch projects. Changes made in this 3.0 Preview will not be saved.',
         description: 'Import project message',
@@ -127,12 +133,12 @@ const ImportModal = ({intl, ...props}) => (
                         previewFaqLink: (
                             <a
                                 className={styles.faqLink}
-                                href='//scratch.mit.edu/preview-faq'
+                                href="//scratch.mit.edu/3faq"
                             >
                                 <FormattedMessage
-                                    defaultMessage='Preview FAQ'
-                                    description='link to Scratch 3.0 preview FAQ page'
-                                    id='gui.importInfo.previewfaqlink'
+                                    defaultMessage="FAQ"
+                                    description="link to Scratch 3.0 FAQ page"
+                                    id="gui.importInfo.previewfaqlinktext"
                                 />
                             </a>
                         )

src/components/menu-bar/menu-bar.jsx

@@ -376,7 +376,7 @@ class MenuBar extends React.Component {
                 <div className={classNames(styles.menuBarItem, styles.feedbackButtonWrapper)}>
                     <a
                         className={styles.feedbackLink}
-                        href="https://scratch.mit.edu/discuss/topic/299791/"
+                        href="https://scratch.mit.edu/discuss/57/"
                         rel="noopener noreferrer"
                         target="_blank"
                     >

src/components/preview-modal/preview-modal.jsx

@@ -12,6 +12,11 @@ const messages = defineMessages({
         id: 'gui.previewInfo.label',
         defaultMessage: 'Try Scratch 3.0',
         description: 'Scratch 3.0 modal label - for accessibility'
+    },
+    previewWelcome: {
+        defaultMessage: 'Welcome to the Scratch 3.0 Beta',
+        description: 'Header for Preview Info Modal',
+        id: 'gui.previewInfo.welcome'
     }
 });
 
@@ -28,16 +33,16 @@ const PreviewModal = ({intl, ...props}) => (
         <Box className={styles.body}>
             <h2>
                 <FormattedMessage
-                    defaultMessage='Welcome to the Scratch 3.0 Preview'
-                    description='Header for Preview Info Modal'
-                    id='gui.previewInfo.welcome'
+                    defaultMessage="Welcome to the Scratch 3.0 Beta"
+                    description="Header for Beta Info Modal"
+                    id="gui.previewInfo.betawelcome"
                 />
             </h2>
             <p>
                 <FormattedMessage
-                    defaultMessage='We're working on the next generation of Scratch. We're excited for you to try it!'
-                    description='Invitation to try 3.0 preview'
-                    id='gui.previewInfo.invitation'
+                    defaultMessage="We're working on the next generation of Scratch. We're excited for you to try it!"
+                    description="Invitation to try 3.0 Beta"
+                    id="gui.previewInfo.invitation"
                 />
             </p>
 
@@ -52,9 +57,9 @@ const PreviewModal = ({intl, ...props}) => (
                     onClick={props.onCancel}
                 >
                     <FormattedMessage
-                        defaultMessage='Not Now'
-                        description='Label for button to back out of trying Scratch 3.0 preview'
-                        id='gui.previewInfo.notnow'
+                        defaultMessage="Not Now"
+                        description="Label for button to back out of trying Scratch 3.0 Beta"
+                        id="gui.previewInfo.notnow"
                     />
                 </button>
                 <button
@@ -67,9 +72,9 @@ const PreviewModal = ({intl, ...props}) => (
                     onClick={props.onTryIt}
                 >
                     <FormattedMessage
-                        defaultMessage='Try It! {caticon}'
-                        description='Label for button to try Scratch 3.0 preview'
-                        id='gui.previewModal.tryit'
+                        defaultMessage="Try It! {caticon}"
+                        description="Label for button to try Scratch 3.0 Beta"
+                        id="gui.previewModal.tryit"
                         values={{
                             caticon: (
                                 <img
@@ -98,19 +103,19 @@ const PreviewModal = ({intl, ...props}) => (
             </Box>
             <Box className={styles.faqLinkText}>
                 <FormattedMessage
-                    defaultMessage='To learn more, go to the {previewFaqLink}.'
-                    description='Invitation to try 3.0 preview'
-                    id='gui.previewInfo.previewfaq'
+                    defaultMessage="To learn more, go to the {previewFaqLink}."
+                    description="Invitation to try 3.0 Beta"
+                    id="gui.previewInfo.previewfaq"
                     values={{
                         previewFaqLink: (
                             <a
                                 className={styles.faqLink}
-                                href='//scratch.mit.edu/preview-faq'
+                                href="//scratch.mit.edu/3faq"
                             >
                                 <FormattedMessage
-                                    defaultMessage='Preview FAQ'
-                                    description='link to Scratch 3.0 preview FAQ page'
-                                    id='gui.previewInfo.previewfaqlink'
+                                    defaultMessage="FAQ"
+                                    description="link to Scratch 3.0 FAQ page"
+                                    id="gui.previewInfo.previewfaqlinktext"
                                 />
                             </a>
                         )

src/components/webgl-modal/webgl-modal.jsx

@@ -74,12 +74,12 @@ const WebGlModal = ({intl, ...props}) => (
                         previewFaqLink: (
                             <a
                                 className={styles.faqLink}
-                                href="//scratch.mit.edu/preview-faq"
+                                href="//scratch.mit.edu/3faq"
                             >
                                 <FormattedMessage
-                                    defaultMessage="preview FAQ"
+                                    defaultMessage="FAQ"
                                     description="link to Scratch 3.0 FAQ page"
-                                    id="gui.webglModal.previewfaqlink"
+                                    id="gui.webglModal.previewfaqlinktext"
                                 />
                             </a>
                         )

test/smoke/browser.test.js

@@ -8,7 +8,7 @@ const {
 // Make the default timeout longer, Sauce tests take ~30s
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 60 * 1000; // eslint-disable-line
 
-const SUPPORTED_MESSAGE = 'Welcome to the Scratch 3.0 Preview';
+const SUPPORTED_MESSAGE = 'Welcome to the Scratch 3.0 Beta';
 const UNSUPPORTED_MESSAGE = 'Scratch 3.0 does not support Internet Explorer';
 
 // Driver configs can be generated with the Sauce Platform Configurator