diff --git a/src/components/browser-modal/browser-modal.jsx b/src/components/browser-modal/browser-modal.jsx
index bb5c82fcffab08ea5c860ea746f8ebc9d0a6c71e..457105727df41413ee3767d0d02cada6cdcaf1c3 100644
--- a/src/components/browser-modal/browser-modal.jsx
+++ b/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>
)
diff --git a/src/components/import-modal/import-modal.jsx b/src/components/import-modal/import-modal.jsx
index 08f0d4f1b98004a3c999ad7483e6de3df4b7fec3..eb01fe69baa1533cbdce6635370a49821bc29efa 100644
--- a/src/components/import-modal/import-modal.jsx
+++ b/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>
)
diff --git a/src/components/menu-bar/menu-bar.jsx b/src/components/menu-bar/menu-bar.jsx
index 08bd6b5561446df26a4968c64d559ce1d0d3f2bc..edbc8a971be54461c4257d8e959ebbcf3e55fc00 100644
--- a/src/components/menu-bar/menu-bar.jsx
+++ b/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"
>
diff --git a/src/components/preview-modal/preview-modal.jsx b/src/components/preview-modal/preview-modal.jsx
index a8da9c3845f4974a63bba76f1498f44685c3b05b..7eff06447425d4972945e7d8cccc812b82c2e26c 100644
--- a/src/components/preview-modal/preview-modal.jsx
+++ b/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>
)
diff --git a/src/components/preview-modal/welcome.png b/src/components/preview-modal/welcome.png
index 520b619919b1b9dfabcef138fc16fc64aebee9e6..1172df932b425ae538bcfe2d23430373310e325e 100644
Binary files a/src/components/preview-modal/welcome.png and b/src/components/preview-modal/welcome.png differ
diff --git a/src/components/webgl-modal/webgl-modal.jsx b/src/components/webgl-modal/webgl-modal.jsx
index 0a7b753aae47d4ed746ac1da18fc8fe2ad3e0ebf..f0c3c6c27529eb3ac8ab782131898698634459b7 100644
--- a/src/components/webgl-modal/webgl-modal.jsx
+++ b/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>
)
diff --git a/test/smoke/browser.test.js b/test/smoke/browser.test.js
index aa894a05578bcebb74f335469ed5e6a2d85710f8..941b3eef3bd7e34b0165c2002898d4b170fc4b73 100644
--- a/test/smoke/browser.test.js
+++ b/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