Merge pull request #3745 from LLK/release/2020-03-12

[Develop] Release/2020 03 12

package.json

@@ -128,7 +128,7 @@
     "redux-mock-store": "^1.2.3",
     "redux-thunk": "2.0.1",
     "sass-loader": "6.0.6",
-    "scratch-gui": "0.1.0-prerelease.20200311195145",
+    "scratch-gui": "0.1.0-prerelease.20200304215547",
     "scratch-l10n": "latest",
     "selenium-webdriver": "3.6.0",
     "slick-carousel": "1.6.0",

src/components/helpform/helpform.jsx

@@ -4,10 +4,10 @@ const React = require('react');
 const FormattedMessage = require('react-intl').FormattedMessage;
 
 const HelpForm = props => {
-    const prefix = 'https://mitscratch.freshdesk.com/widgets/feedback_widget/new?&widgetType=embedded&widgetView=yes&screenshot=No&searchArea=No&captcha=yes';
+    const prefix = 'https://mitscratch.freshdesk.com/widgets/feedback_widget/new?&widgetType=embedded&widgetView=yes&screenshot=No&searchArea=No';
     const title = `formTitle=${props.title}`;
     const username = `helpdesk_ticket[custom_field][cf_scratch_name_40167]=${props.user.username || ''}`;
-    const agentText = encodeURI(window.navigator.userAgent.replace(';', ' -'));
+    const agentText = encodeURIComponent(window.navigator.userAgent);
     const browser = `helpdesk_ticket[custom_field][cf_browser_40167]=${agentText}`;
     const formSubject = `helpdesk_ticket[subject]=${props.subject}`;
     const formDescription = `helpdesk_ticket[description]=${props.body}`;

src/components/install-scratch/install-scratch.jsx

@@ -13,6 +13,14 @@ const Step = require('../../components/steps/step.jsx');
 
 require('./install-scratch.scss');
 
+const downloadUrls = {
+    mac: 'https://downloads.scratch.mit.edu/desktop/Scratch%20Desktop-3.6.0.dmg',
+    win: 'https://downloads.scratch.mit.edu/desktop/Scratch%20Desktop%20Setup%203.9.0.exe',
+    googlePlayStore: 'https://play.google.com/store/apps/details?id=org.scratch',
+    microsoftStore: 'https://www.microsoft.com/store/apps/9pfgj25jl6x3?cid=storebadge&ocid=badge',
+    macAppStore: 'https://apps.apple.com/us/app/scratch-desktop/id1446785996?mt=12'
+};
+
 const InstallScratch = ({
     currentOS
 }) => (
@@ -67,7 +75,7 @@ const InstallScratch = ({
                             {currentOS === OS_ENUM.WINDOWS && (
                                 <a
                                     className="ms-badge"
-                                    href="https://www.microsoft.com/store/apps/9pfgj25jl6x3?cid=storebadge&ocid=badge"
+                                    href={downloadUrls.microsoftStore}
                                     rel="noopener noreferrer"
                                     target="_blank"
                                 >
@@ -79,7 +87,7 @@ const InstallScratch = ({
                             {currentOS === OS_ENUM.MACOS && (
                                 <a
                                     className="macos-badge"
-                                    href="https://apps.apple.com/us/app/scratch-desktop/id1446785996?mt=12"
+                                    href={downloadUrls.macAppStore}
                                     rel="noopener noreferrer"
                                     target="_blank"
                                 >
@@ -91,7 +99,7 @@ const InstallScratch = ({
                             {isFromGooglePlay(currentOS) && (
                                 <a
                                     className="play-badge"
-                                    href="https://play.google.com/store/apps/details?id=org.scratch"
+                                    href={downloadUrls.googlePlayStore}
                                     rel="noopener noreferrer"
                                     target="_blank"
                                 >
@@ -106,14 +114,7 @@ const InstallScratch = ({
                                     <span className="horizontal-divider">
                                         <FormattedMessage id="installScratch.or" />
                                     </span>
-                                    <a
-                                        href={
-                                            currentOS === OS_ENUM.WINDOWS ?
-                                                'https://downloads.scratch.mit.edu/desktop/Scratch%20Desktop%20Setup%203.6.0.exe' :
-                                                'https://downloads.scratch.mit.edu/desktop/Scratch%20Desktop-3.6.0.dmg'
-                                        }
-
-                                    >
+                                    <a href={currentOS === OS_ENUM.WINDOWS ? downloadUrls.win : downloadUrls.mac}>
                                         <FormattedMessage id="installScratch.directDownload" />
                                     </a>
                                 </React.Fragment>

src/routes.json

@@ -94,8 +94,8 @@
     },
     {
         "name": "contact-us",
-        "pattern": "^/contact-us/?$",
-        "routeAlias": "/contact-us/?$",
+        "pattern": "^/contact-us/?(\\?.*)?$",
+        "routeAlias": "/contact-us/?",
         "view": "contact-us/contact-us",
         "title": "Contact Us",
         "viewportWidth": "device-width"

src/views/contact-us/contact-us.jsx

@@ -39,7 +39,7 @@ class ContactUs extends React.Component {
                         <p><FormattedMessage
                             id="contactUs.intro"
                             values={{faqLink: (
-                                <a href="/faq"><FormattedMessage id="contactUs.faqLinkText" /></a>
+                                <a href="/info/faq"><FormattedMessage id="contactUs.faqLinkText" /></a>
                             )}}
                         /></p>
                         <p><FormattedMessage id="contactUs.forumsInfo" /></p>
@@ -53,13 +53,13 @@ class ContactUs extends React.Component {
                             <li><FormattedMessage
                                 id="contactUs.scriptsForum"
                                 values={{scriptsLink: (
-                                    <a href="/discuss/4/"><FormattedMessage id="contactUs.scriptsLinkText" /></a>
+                                    <a href="/discuss/7/"><FormattedMessage id="contactUs.scriptsLinkText" /></a>
                                 )}}
                             /></li>
                             <li><FormattedMessage
                                 id="contactUs.bugsForum"
                                 values={{bugsLink: (
-                                    <a href="/discuss/4/"><FormattedMessage id="contactUs.bugsLinkText" /></a>
+                                    <a href="/discuss/3/"><FormattedMessage id="contactUs.bugsLinkText" /></a>
                                 )}}
                             /></li>
                         </ul>
@@ -69,7 +69,7 @@ class ContactUs extends React.Component {
                 <nav>
                     <ol>
                         <li className="nav-header"><FormattedMessage id="contactUs.findHelp" /></li>
-                        <li><a href="/faq"><FormattedMessage id="contactUs.faqLinkText" /></a></li>
+                        <li><a href="/info/faq"><FormattedMessage id="contactUs.faqLinkText" /></a></li>
                     </ol>
                 </nav>
                 <HelpForm