Skip to content

GitLab

S
scratch-www
Unverified Commit 92ac2786 authored by Benjamin Wheeler's avatar Benjamin Wheeler Committed by GitHub
Browse files
Options

Merge pull request #2474 from picklesrus/download-content-updates 

Download content updates
parents 2c40e2d7 3ebdcc11
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 25 deletions
src/views/download/download.jsx
View file @ 92ac2786
......@@ -52,7 +52,7 @@ class Download extends React.Component {
alt={this.props.intl.formatMessage({id: 'download.iconAltText'})}
className="icon"
height="40"
src="/images/download/placeholder.png"
src="/images/download/icon.png"
width="40"
/>
<FormattedMessage id="download.title" />
......@@ -107,14 +107,18 @@ class Download extends React.Component {
number={1}
>
<span className="step-description">
<FormattedMessage id="download.downloadAndInstall" />
<FormattedMessage id="download.downloadScratchDesktop" />
</span>
<div className="downloads-container">
<a
className="download-button"
href="https://beta.scratch.mit.edu/"
href={
this.state.OS === OS_ENUM.WINDOWS ?
'https://downloads.scratch.mit.edu/desktop/Scratch%20Desktop%20Setup%201.0.0.exe' :
'https://downloads.scratch.mit.edu/desktop/Scratch%20Desktop-1.0.0.dmg'
}
>
<span>Download Scratch Desktop</span>
<FormattedMessage id="download.downloadButton" />
</a>
</div>
</Step>
......@@ -135,9 +139,9 @@ class Download extends React.Component {
<img
alt=""
className="screenshot"
src={`/images/scratchlink/${
src={`/images/download/${
this.state.OS === OS_ENUM.WINDOWS ? 'windows' : 'mac'
}-toolbar.png`}
}-install.png`}
/>
</div>
</Step>
......@@ -151,19 +155,35 @@ class Download extends React.Component {
</h2>
<h3 className="faq-question">
<FormattedMessage id="download.whenSupportLinux" />
<FormattedMessage id="download.canIUseScratchLink" />
</h3>
<p>
<FormattedMessage id="download.supportLinuxAnswer" />
<FormattedMessage id="download.canIUseScratchLinkAnswer" />
</p>
<h3 className="faq-question">
<FormattedMessage id="download.desktopAndBrowser" />
</h3>
<p>
<FormattedMessage id="download.yesAnswer" />
</p>
<h3 className="faq-question">
<FormattedMessage id="download.canIShare" />
</h3>
<p>
<FormattedMessage id="download.canIShareAnswer" />
</p>
<h3 className="faq-question">
<FormattedMessage id="download.supportChromeOS" />
</h3>
<p>
<FormattedMessage id="download.supportChromeOSAnswer" />
</p>
<h3 className="faq-question">
<FormattedMessage id="download.whenSupportLinux" />
</h3>
<p>
<FormattedMessage id="download.supportLinuxAnswer" />
</p>
</FlexRow>
</div>
<div className="download-section blue">
......
src/views/download/download.scss
View file @ 92ac2786
......@@ -22,7 +22,7 @@
border-radius: 8px;
background-color: $ui-blue;
cursor: pointer;
padding: 1rem;
padding: 1rem 2rem;
color: $ui-white;
font-size: 1rem;
}
......@@ -117,10 +117,8 @@
text-align: center;
}
.store-badge {
display: block;
width: 150px;
height: 80px;
.step-image {
height: 14rem;
}
}
......
src/views/download/l10n.json
View file @ 92ac2786
{
"download.title": "Scratch 3.0 Desktop",
"download.intro": "You can install the Scratch 3.0 editor to work on projects without an internet connection. This version will work on Windows and MacOS.",
"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.requirements": "Requirements",
"download.imgAltDownloadIllustration" : "Scratch 3.0 Desktop screenshot",
"download.installHeaderTitle": "Install Scratch Desktop",
"download.downloadAndInstall": "Download and install Scratch Desktop",
"download.downloadScratchDesktop": "Download Scratch Desktop",
"download.downloadButton": "Download",
"download.troubleshootingTitle": "FAQ",
"download.startScratchDesktop": "Start Scratch Desktop",
"download.howDoIInstall": "How do I install Scratch Desktop?",
"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.supportChromeOS" : "When will you have Scratch Desktop for ChromeOS?",
"download.supportChromeOSAnswer": "Scratch Desktop for ChromeOS is not yet available. We are working on it and expect to release later in 2019.",
"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 an older version of Scratch Desktop?",
"download.olderVersions": "Looking for the Scratch 2.0 Offline Editor or Scratch 1.4?",
"download.scratch1-4Desktop" : "Scratch 1.4 Desktop",
"download.scratch2Desktop" : "Scratch 2.0 Desktop",
"download.cannotAccessMacStore" : "What if I can't access the Mac App Store?",
"download.cannotAccessWindowsStore" : "What if I can't access the Microsoft Store?",
"download.appstoreAccessAnswer" : "You can download Scratch Desktop directly to your computer by {directDownloadLink}.",
"download.directDownloadText" : "clicking here",
"download.macMoveToApplications" : "Move Scratch Desktop to your Applications folder and start Scratch Desktop.",
"download.winMoveToApplications" : "Run it."
"download.macMoveToApplications" : "Open the .dmg file. Move Scratch Desktop into Applications.",
"download.winMoveToApplications" : "Run the .exe file.",
"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.desktopAndBrowser": "Can I use Scratch Desktop and also have Scratch open in the browser?",
"download.yesAnswer" : "Yes.",
"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."
}
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