Mostly adding messages and removing unnecessary sections

This commit is contained in:
picklesrus 2018-12-10 18:09:36 -05:00
parent 2baf5860ca
commit d7a678ad8c
2 changed files with 51 additions and 49 deletions

View file

@ -21,8 +21,8 @@ class Download extends React.Component {
constructor (props) { constructor (props) {
super(props); super(props);
bindAll(this, [ bindAll(this, [
'onSetOS' 'onSetOS'
]); ]);
let detectedOS = OS_ENUM.WINDOWS; let detectedOS = OS_ENUM.WINDOWS;
if (window.navigator && window.navigator.platform) { if (window.navigator && window.navigator.platform) {
if (window.navigator.platform === 'MacIntel') { if (window.navigator.platform === 'MacIntel') {
@ -122,16 +122,6 @@ class Download extends React.Component {
}-store-badge.svg`} }-store-badge.svg`}
/> />
</a> </a>
<span className="horizontal-divider">
<FormattedMessage id="download.or" />
</span>
<a
href={`https://downloads.scratch.mit.edu/link/${
this.state.OS === OS_ENUM.WINDOWS ? 'windows' : 'mac'
}.zip`}
>
<FormattedMessage id="download.directDownload" />
</a>
</div> </div>
</Step> </Step>
@ -141,7 +131,7 @@ class Download extends React.Component {
number={2} number={2}
> >
<span className="step-description"> <span className="step-description">
<FormattedMessage id="download.startScratchLink" /> <FormattedMessage id="download.startScratchDesktop" />
</span> </span>
<div className="step-image"> <div className="step-image">
<img <img
@ -159,11 +149,32 @@ class Download extends React.Component {
<div className="download-section faq"> <div className="download-section faq">
<FlexRow className="inner column"> <FlexRow className="inner column">
<h2><FormattedMessage id="download.troubleshootingTitle" /></h2> <h2><FormattedMessage id="download.troubleshootingTitle" /></h2>
<h3 className="faq-title"><FormattedMessage id="download.haveYouInstalled" /></h3>
<h3 className="faq-title">
<FormattedMessage id="download.howDoIInstall" />
</h3>
<p> <p>
<FormattedMessage id="download.answerInstalled" /> You will need to install lorem ipsum dolor sit amet, consectetur adipiscing elit.
</p> </p>
<h3 className="faq-title"><FormattedMessage id="download.question2" /></h3>
<h3 className="faq-title">
<FormattedMessage id="download.whenSupportLinux" />
</h3>
<p>
<FormattedMessage id="download.supportLinuxAnswer" />
</p>
<h3 className="faq-title">
<FormattedMessage id="download.supportChromeOS" />
</h3>
<p>
<FormattedMessage id="download.supportChromeOSAnswer" />
</p>
<h3 className="faq-title">
<FormattedMessage id="download.cannotAccessMacStore" />
</h3>
<p> <p>
<FormattedMessage id="download.question2" /> <FormattedMessage id="download.question2" />
</p> </p>
@ -172,8 +183,12 @@ class Download extends React.Component {
<div className="download-section blue"> <div className="download-section blue">
<FlexRow className="inner column"> <FlexRow className="inner column">
<h2><FormattedMessage id="download.olderVersions" /></h2> <h2>
<h3 className="faq-title"><FormattedMessage id="download.lookingForOlder" /></h3> <FormattedMessage id="download.olderVersionsTitle" />
</h2>
<h3 className="faq-title">
<FormattedMessage id="download.olderVersions" />
</h3>
<FlexRow> <FlexRow>
<div className="older-version"> <div className="older-version">
<img <img
@ -185,7 +200,7 @@ class Download extends React.Component {
/> />
<p> <p>
<a href="/scratch_1.4"> <a href="/scratch_1.4">
<FormattedMessage id="download.scratch14Desktop" /> <FormattedMessage id="download.scratch1-4Desktop" />
<img src="images/download/r-arrow.svg" /> <img src="images/download/r-arrow.svg" />
</a> </a>
</p> </p>

View file

@ -1,32 +1,19 @@
{ {
"download.title": "Scratch 2.0 Offline Editor", "download.title": "Scratch 3.0 Desktop",
"download.intro": "You can install the Scratch 2.0 editor to work on projects without an internet connection. This version will work on Windows and MacOS.", "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.introMac": "<b>Note for Mac Users:</b> the latest version of Scratch 2.0 Offline requires Adobe AIR 20. To upgrade to Adobe AIR 20 manually, go <a href=\"https://get.adobe.com/air/\">here</a>.", "download.requirements": "Requirements",
"download.installation": "Installation", "download.imgAltDownloadIllustration" : "Scratch 3.0 Desktop screenshot",
"download.airTitle": "Adobe AIR", "download.installHeaderTitle": "Install Scratch Desktop",
"download.airBody": "If you don't already have it, download and install the latest <a href=\"http://get.adobe.com/air/\">Adobe AIR</a>", "download.downloadAndInstall": "Download and install Scratch Desktop",
"download.macOSX": "Mac OS X", "download.troubleshootingTitle": "FAQ / Troubleshooting",
"download.macOlder": "Mac OS 10.5 & Older", "download.startScratchDesktop": "Start Scratch Desktop",
"download.windows": "Windows", "download.howDoIInstall": "How do I install Scratch Desktop?",
"download.download": "Download", "download.whenSupportLinux": "When will you have Scratch Desktop for Linux?",
"download.offlineEditorTitle": "Scratch Offline Editor", "download.supportLinuxAnswer" : "Scratch 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.offlineEditorBody": "Next download and install the Scratch 2.0 Offline Editor", "download.supportChromeOS" : "When will you have Scratch Desktop for ChromeOS?",
"download.supportMaterialsTitle": "Support Materials", "download.supportChromeOSAnswer": "Scratch for ChromeOS is not yet available. We are working on it and expect to release later in 2019.",
"download.supportMaterialsBody": "Need some help getting started? Here are some helpful resources.", "download.olderVersionsTitle" : "Older Versions",
"download.starterProjects": "Starter Projects", "download.olderVersions": "Looking for an older version of Scratch Desktop?",
"download.gettingStarted": "Getting Started Guide", "download.scratch1-4Desktop" : "Scratch 1.4 Desktop",
"download.scratchCards": "Scratch Cards", "download.scratch2Desktop" : "Scratch 2.0 Desktop"
"download.updatesTitle": "Updates",
"download.updatesBody": "The Offline Editor can update itself (with user permission). It will check for updates at startup or you can use the \"Check for updates\" command in the file menu.",
"download.currentVersion": "The current version is {version}.",
"download.otherVersionsTitle": "Other Versions of Scratch",
"download.otherVersionsOlder": "If you have an older computer, or cannot install the Scratch 2.0 offline editor, you can try installing <a href=\"http://scratch.mit.edu/scratch_1.4/\">Scratch 1.4</a>.",
"download.otherVersionsAdmin": "If you are a network administrator: a Scratch 2.0 MSI has been created and maintained by a member of the community and hosted for public download <a href=\"http://llk.github.io/scratch-msi/\">here</a>.",
"download.knownIssuesTitle": "Known issues",
"download.knownIssuesOne": "If your offline editor is crashing directly after Scratch is opened, install the Scratch 2 offline editor again (see step 2 above). This issue is due to a bug introduced in Adobe AIR version 14 (released April 2014).",
"download.knownIssuesTwo": "Graphic effects blocks (in \"Looks\") may slow down projects due to a known Flash bug.",
"download.knownIssuesThree": "The <b>backpack</b> is not yet available.",
"download.knownIssuesFour": "On Mac OS you may see a prompt indicating that \"Scratch 2 is trying to install a new helper tool\" and asking for your user name and password. We are currently investigating a solution to this problem.",
"download.reportBugs": "Report Bugs and Glitches",
"download.notAvailable": "Hmm, editor downloads are not available right now - please refresh the page to try again."
} }