scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 07:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Copy changes for Download page.

Browse source
This commit is contained in:
Chris Garrity 2019-10-02 15:57:06 -07:00
parent 01c509d527
commit 54c5484263
6 changed files with 88 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/extension-landing/extension-requirements.jsx
View file

@ -44,7 +44,7 @@ const ExtensionRequirements = props => (
alt=""
src="svgs/extensions/android.svg"
/>
Android 5.0+
Android 6.0+
</span>
</React.Fragment>
)}

11
src/components/install-scratch/install-scratch.jsx
View file

@ -46,11 +46,16 @@ const InstallScratch = ({
>
<span className="step-description">
<React.Fragment>
{isDownloaded(currentOS) && (
{currentOS === OS_ENUM.WINDOWS && (
<FormattedMessage
id={CHROME_APP_RELEASED ? 'installScratch.downloadScratchAppGeneric' :
id={CHROME_APP_RELEASED ? 'installScratch.getScratchAppWindows' :
'installScratch.downloadScratchDesktop'}
/>
)}
{currentOS === OS_ENUM.MACOS && (
<FormattedMessage
id={CHROME_APP_RELEASED ? 'installScratch.getScratchAppMacOs' :
'installScratch.downloadScratchDesktop'}
values={{operatingsystem: currentOS}}
/>
)}
{isFromGooglePlay(currentOS) && (

8
src/l10n.json
View file

@ -137,12 +137,14 @@
"installScratch.or": "or",
"installScratch.directDownload": "Direct download",
"installScratch.desktopHeaderTitle": "Install Scratch Desktop",
"installScratch.appHeaderTitle": "Install Scratch for {operatingsystem}",
"installScratch.appHeaderTitle": "Install the Scratch app for {operatingsystem}",
"installScratch.downloadScratchDesktop": "Download Scratch Desktop",
"installScratch.downloadScratchAppGeneric": "Download Scratch for {operatingsystem}",
"installScratch.getScratchAppPlay": "Get Scratch on the Google Play Store",
"installScratch.getScratchAppPlay": "Get the Scratch app on the Google Play Store",
"installScratch.getScratchAppMacOs": "Get the Scratch app on the Mac App Store",
"installScratch.getScratchAppWindows": "Get the Scratch app on the Microsoft Store",
"installScratch.useScratchApp": "Open the Scratch app on your device.",
"installScratchLink.installHeaderTitle": "Install Scratch Link",
"installScratchLink.downloadAndInstall": "Download and install Scratch Link.",
"installScratchLink.startScratchLink": "Start Scratch Link and make sure it is running. It should appear in your toolbar.",

75
src/views/download/download.jsx
View file

@ -95,7 +95,7 @@ class Download extends React.Component {
alt=""
src="svgs/extensions/android.svg"
/>
Android 5.0+
Android 6.0+
</span>
</React.Fragment>
)}
@ -181,7 +181,17 @@ class Download extends React.Component {
<FormattedMessage id="download.troubleshootingTitle" />
</h2>
{isDownloaded(this.state.OS) && (
{CHROME_APP_RELEASED && (
<React.Fragment>
<h3 className="faq-question">
<FormattedMessage id="download.doIHaveToDownload" />
</h3>
<p>
<FormattedMessage id="download.doIHaveToDownloadAnswer" />
</p>
</React.Fragment>
)}
{!CHROME_APP_RELEASED && (
<React.Fragment>
<h3 className="faq-question">
<FormattedMessage id="download.canIUseScratchLink" />
@ -191,25 +201,29 @@ class Download extends React.Component {
</p>
</React.Fragment>
)}
{isFromGooglePlay(this.state.OS) && (
{CHROME_APP_RELEASED && (
<React.Fragment>
<h3 className="faq-question">
<FormattedMessage id="download.canIUseExtensions" />
<FormattedMessage id="download.howConnectHardwareDevices" />
</h3>
<p>
<FormattedMessage id="download.canIUseExtensionsAnswer" />
</p>
{isDownloaded(this.state.OS) && (
<p>
<FormattedMessage
id="download.howConnectHardwareDevicesAnswerLink"
values={{operatingsystem: this.state.OS}}
/>
</p>
)}
{isFromGooglePlay(this.state.OS) && (
<p>
<FormattedMessage
id="download.howConnectHardwareDevicesAnswerApp"
values={{operatingsystem: this.state.OS}}
/>
</p>
)}
</React.Fragment>
)}
<h3 className="faq-question">
{isFromGooglePlay(this.state.OS) ?
<FormattedMessage id="download.appAndBrowser" /> :
<FormattedMessage id="download.desktopAndBrowser" />
}
</h3>
<p>
<FormattedMessage id="download.yesAnswer" />
</p>
{isDownloaded(this.state.OS) && (CHROME_APP_RELEASED ? (
<React.Fragment>
<h3 className="faq-question">
@ -248,6 +262,25 @@ class Download extends React.Component {
</p>
</React.Fragment>
)}
<h3 className="faq-question">
{CHROME_APP_RELEASED ?
<FormattedMessage id="download.appAndBrowser" /> :
<FormattedMessage id="download.desktopAndBrowser" />
}
</h3>
<p>
<FormattedMessage id="download.yesAnswer" />
</p>
{CHROME_APP_RELEASED && (
<React.Fragment>
<h3 className="faq-question">
<FormattedMessage id="download.onPhone" />
</h3>
<p>
<FormattedMessage id="download.onPhoneAnswer" />
</p>
</React.Fragment>
)}
{!CHROME_APP_RELEASED && (
<React.Fragment>
<h3 className="faq-question">
@ -259,10 +292,16 @@ class Download extends React.Component {
</React.Fragment>
)}
<h3 className="faq-question">
<FormattedMessage id="download.whenSupportLinux" />
{CHROME_APP_RELEASED ?
<FormattedMessage id="download.whenSupportLinuxApp" /> :
<FormattedMessage id="download.whenSupportLinux" />
}
</h3>
<p>
<FormattedMessage id="download.supportLinuxAnswer" />
{CHROME_APP_RELEASED ?
<FormattedMessage id="download.whenSupportLinuxAppAnswer" /> :
<FormattedMessage id="download.supportLinuxAnswer" />
}
</p>
</FlexRow>
</div>

4
src/views/download/download.scss
View file

@ -56,7 +56,7 @@
.download-info {
padding-right: $cols1;
max-width: $cols6 + ($gutter / $em);
max-width: $cols7 + ($gutter / $em);
align-items: flex-start;
.download-copy {
@ -110,7 +110,7 @@
.download-image {
width: 100%;
max-width: $cols6;
max-width: $cols5;
img {
max-width: 100%;

21
src/views/download/l10n.json
View file

@ -1,35 +1,44 @@
{
"download.title": "Scratch Desktop",
"download.intro": "You can install the Scratch Desktop editor to work on projects without an internet connection. This version will work on Windows and MacOS.",
"download.appTitle": "Download Scratch",
"download.appIntro": "You can install Scratch for free to work on projects without an internet connection.",
"download.appTitle": "Download the Scratch App",
"download.appIntro": "Would you like to create and save Scratch projects without an internet connection? Download the free Scratch app.",
"download.requirements": "Requirements",
"download.imgAltDownloadIllustration" : "Scratch 3.0 Desktop screenshot",
"download.troubleshootingTitle": "FAQ",
"download.startScratchDesktop": "Start Scratch Desktop",
"download.howDoIInstall": "How do I install Scratch Desktop?",
"download.whenSupportLinuxApp": "When will you have the Scratch app available for Linux?",
"download.whenSupportLinux": "When will you have Scratch Desktop for Linux?",
"download.supportLinuxAnswer" : "Scratch Desktop on Linux is currently not supported. We are working with partners and the open-source community to determine if there is a way we can support Linux in the future. Stay tuned!",
"download.whenSupportLinuxAppAnswer" : "The Scratch app is currently not supported on Linux. We are working with partners and the open-source community to determine if there is a way we can support Linux in the future. Stay tuned!",
"download.supportChromeOS" : "When will you have Scratch Desktop for Chromebooks?",
"download.supportChromeOSAnswer": "Scratch Desktop for Chromebooks is not yet available. We are working on it and expect to release later in 2019.",
"download.olderVersionsTitle" : "Older Versions",
"download.olderVersions": "Looking for earlier Scratch Offline Editors?",
"download.olderVersions": "Looking for an earlier version of Scratch?",
"download.scratch1-4Desktop" : "Scratch 1.4",
"download.scratch2Desktop" : "Scratch 2.0 Offline Editor",
"download.cannotAccessMacStore" : "What if I can't access the Mac App Store?",
"download.cannotAccessWindowsStore" : "What if I can't access the Microsoft Store?",
"download.macMoveToApplications" : "Open the .dmg file. Move Scratch Desktop into Applications.",
"download.winMoveToApplications" : "Run the .exe file.",
"download.doIHaveToDownload" : "Do I have to download an app to use Scratch?",
"download.doIHaveToDownloadAnswer" : "No. You can also use the Scratch project editor in any web browser on any device by going to scratch.mit.edu and clicking \"Create\".",
"download.canIUseScratchLink" : "Can I use Scratch Link to connect to extensions?",
"download.canIUseScratchLinkAnswer" : "Yes. However, you will need an Internet connection to use Scratch Link.",
"download.canIUseExtensions" : "Can I connect to hardware extensions?",
"download.canIUseExtensionsAnswer" : "Yes. With the Scratch app you can connect to extensions, and you do not need Scratch Link.",
"download.howConnectHardwareDevices" : "How do I connect the Scratch app to hardware devices?",
"download.howConnectHardwareDevicesAnswerLink" : "You will need to install and run Scratch Link in order to connect to hardware devices when using Scratch app for {operatingsystem}. You will also need an internet connection to use Scratch Link.",
"download.howConnectHardwareDevicesAnswerApp" : "With the Scratch app you can connect to hardware devices like the micro:bit or LEGO Boost. When using the Scratch app for {operatingsystem} you do not need Scratch Link.",
"download.desktopAndBrowser": "Can I use Scratch Desktop and also have Scratch open in the browser?",
"download.appAndBrowser": "Can I use the Scratch app and also have Scratch open in the browser?",
"download.yesAnswer" : "Yes.",
"download.onPhone": "Can I install Scratch on my Android phone?",
"download.onPhoneAnswer" : "No. The current version of Scratch for Android only works on tablets.",
"download.canIShare": "Can I share from 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 from Scratch 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 the project on the Scratch Community.",
"download.canIShareAnswerDownloaded": "This isn’t supported currently. For now, you can save a project from Scratch for {operatingsystem}, 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 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.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."
}