Unverified Commit e4c20446 authored by chrisgarrity's avatar chrisgarrity Committed by GitHub

Merge pull request #3513 from chrisgarrity/download-faq

Additional ChromeOS/Android FAQs for the download page
parents 39aa4bca 0d93c3fa
...@@ -9,6 +9,7 @@ const bindAll = require('lodash.bindall'); ...@@ -9,6 +9,7 @@ const bindAll = require('lodash.bindall');
const Page = require('../../components/page/www/page.jsx'); const Page = require('../../components/page/www/page.jsx');
const render = require('../../lib/render.jsx'); const render = require('../../lib/render.jsx');
const detectOS = require('../../lib/detect-os.js').default; const detectOS = require('../../lib/detect-os.js').default;
const OS_ENUM = require('../../lib/os-enum.js');
const {CHROME_APP_RELEASED} = require('../../lib/feature-flags.js'); const {CHROME_APP_RELEASED} = require('../../lib/feature-flags.js');
const OSChooser = require('../../components/os-chooser/os-chooser.jsx'); const OSChooser = require('../../components/os-chooser/os-chooser.jsx');
const InstallScratch = require('../../components/install-scratch/install-scratch.jsx'); const InstallScratch = require('../../components/install-scratch/install-scratch.jsx');
...@@ -303,6 +304,43 @@ class Download extends React.Component { ...@@ -303,6 +304,43 @@ class Download extends React.Component {
<FormattedMessage id="download.supportLinuxAnswer" /> <FormattedMessage id="download.supportLinuxAnswer" />
} }
</p> </p>
{CHROME_APP_RELEASED && isFromGooglePlay(this.state.OS) && (
<React.Fragment>
<h3 className="faq-question">
<FormattedMessage id="download.whyNoDevicesVisible" />
</h3>
<p>
<FormattedMessage
id="download.whyNoDevicesVisibleAnswer"
values={{
devicePosessive: (
this.state.OS === OS_ENUM.ANDROID ?
<FormattedMessage id="download.androidPossessive" /> :
<FormattedMessage id="download.chromebookPossessive" />
),
whyNoDevicesContactUsLink: (
<a href="//scratch.mit.edu/contact-us/">
<FormattedMessage id="download.whyNoDevicesContactUsLink" />
</a>
)
}}
/>
</p>
</React.Fragment>
)}
{CHROME_APP_RELEASED && isFromGooglePlay(this.state.OS) && (
<React.Fragment>
<h3 className="faq-question">
<FormattedMessage
id="download.whyAskForLocation"
values={{operatingsystem: this.state.OS}}
/>
</h3>
<p>
<FormattedMessage id="download.whyAskForLocationAnswer" />
</p>
</React.Fragment>
)}
</FlexRow> </FlexRow>
</div> </div>
......
...@@ -40,5 +40,12 @@ ...@@ -40,5 +40,12 @@
"download.canIShareAnswer": "This isn’t supported currently. For now, you can save a project from Scratch Desktop, upload it to your Scratch account, and share it there. In a later version we will add the ability to upload to your Scratch account directly in Scratch Desktop.", "download.canIShareAnswer": "This isn’t supported currently. For now, you can save a project from Scratch Desktop, upload it to your Scratch account, and share it there. In a later version we will add the ability to upload to your Scratch account directly in Scratch Desktop.",
"download.canIShareApp": "Can I share to the online community from the Scratch app for {operatingsystem}?", "download.canIShareApp": "Can I share to the online community from the Scratch app for {operatingsystem}?",
"download.canIShareAnswerPlayStore": "Yes. Click the 3-dots menu on a project in the lobby and select \"Share\" from the options. In addition to sharing by email, you can sign in to your Scratch account and share a project to the Scratch online community.", "download.canIShareAnswerPlayStore": "Yes. Click the 3-dots menu on a project in the lobby and select \"Share\" from the options. In addition to sharing by email, you can sign in to your Scratch account and share a project to the Scratch online community.",
"download.canIShareAnswerDownloaded": "Sharing directly to online community from the Scratch app for {operatingsystem} is not currently supported. For now, you can export a project from the Scratch app, then log onto the Scratch website, and upload and share your project there." "download.canIShareAnswerDownloaded": "Sharing directly to online community from the Scratch app for {operatingsystem} is not currently supported. For now, you can export a project from the Scratch app, then log onto the Scratch website, and upload and share your project there.",
"download.whyNoDevicesVisible" : "Why doesn't Scratch show any devices when I try to connect hardware extensions?",
"download.whyNoDevicesVisibleAnswer": "We’ve found that turning your {devicePosessive} bluetooth off and on again in the system settings usually allows you to see hardware devices again. If the problem persists, please {whyNoDevicesContactUsLink}.",
"download.whyNoDevicesContactUsLink": "contact us",
"download.chromebookPossessive": "Chromebook's",
"download.androidPossessive": "Android tablet's",
"download.whyAskForLocation" : "Why is {operatingsystem} asking for my location?",
"download.whyAskForLocationAnswer" : "Scratch uses bluetooth to connect to other devices, such as a micro:bit or LEGO BOOST. Bluetooth can be used to provide location data to the app, so Google requires every app that uses bluetooth ask users for permission to access their location. Scratch will not use bluetooth to track your location."
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment