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

Merge pull request #1886 from thisandagain/bugfix/1880

Browse source 
Remove references to Linux for the Scratch 2.0 offline editor
This commit is contained in:
Andrew Sliwinski 2018-05-16 10:01:20 -04:00 committed by GitHub
commit a4189359d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/news/news.json
View file

@ -2,7 +2,7 @@
{ {
"id": 128283902498, "id": 128283902498,
"headline": "Update to Scratch Offline Editor", "headline": "Update to Scratch Offline Editor",
"copy": "We’ve released an update to Offline Editor which fixed bugs affecting Linux users.", "copy": "We’ve released an update to Offline Editor which fixed bugs affecting Windows users.",
"url": "https://scratch.mit.edu/news#128283902498", "url": "https://scratch.mit.edu/news#128283902498",
"image": "https://33.media.tumblr.com/695b93f4ab74c68feaef1fe03baebdd5/tumblr_inline_n0xubtT0vU1szpavb.png" "image": "https://33.media.tumblr.com/695b93f4ab74c68feaef1fe03baebdd5/tumblr_inline_n0xubtT0vU1szpavb.png"
}, },

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

@ -55,8 +55,7 @@ class Download extends React.Component {
downloadUrls = { downloadUrls = {
mac: `${downloadPath}${this.state.swfVersion}.dmg`, mac: `${downloadPath}${this.state.swfVersion}.dmg`,
mac105: `${downloadPath}${this.state.swfVersion}.air`, mac105: `${downloadPath}${this.state.swfVersion}.air`,
windows: `${downloadPath}${this.state.swfVersion}.exe`, windows: `${downloadPath}${this.state.swfVersion}.exe`
linux: `${downloadPath}${this.state.swfVersion}.air`
}; };
} }
@ -143,12 +142,6 @@ class Download extends React.Component {
<FormattedMessage id="download.download" /> <FormattedMessage id="download.download" />
</a> </a>
</li> </li>
<li className="installation-downloads-item">
<FormattedMessage id="download.linux" /> -
{' '}<a href="http://airdownload.adobe.com/air/lin/download/2.6/AdobeAIRInstaller.bin">
<FormattedMessage id="download.download" />
</a>
</li>
</ul> </ul>
</div> </div>
<div className="installation-column"> <div className="installation-column">
@ -180,12 +173,6 @@ class Download extends React.Component {
<FormattedMessage id="download.download" /> <FormattedMessage id="download.download" />
</a> </a>
</li> </li>
<li className="installation-downloads-item">
<FormattedMessage id="download.linux" /> -
{' '}<a href={downloadUrls.linux}>
<FormattedMessage id="download.download" />
</a>
</li>
</ul> </ul>
]} ]}
{this.state.swfVersion === -1 ? [ {this.state.swfVersion === -1 ? [

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

@ -1,6 +1,6 @@
{ {
"download.title": "Scratch 2.0 Offline Editor", "download.title": "Scratch 2.0 Offline Editor",
"download.intro": "You can install the Scratch 2.0 editor to work on projects without an internet connection. This version will work on Mac, Windows, and some versions of Linux (32 bit).", "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.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.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.installation": "Installation", "download.installation": "Installation",
"download.airTitle": "Adobe AIR", "download.airTitle": "Adobe AIR",
@ -8,7 +8,6 @@
"download.macOSX": "Mac OS X", "download.macOSX": "Mac OS X",
"download.macOlder": "Mac OS 10.5 & Older", "download.macOlder": "Mac OS 10.5 & Older",
"download.windows": "Windows", "download.windows": "Windows",
"download.linux": "Linux",
"download.download": "Download", "download.download": "Download",
"download.offlineEditorTitle": "Scratch Offline Editor", "download.offlineEditorTitle": "Scratch Offline Editor",
"download.offlineEditorBody": "Next download and install the Scratch 2.0 Offline Editor", "download.offlineEditorBody": "Next download and install the Scratch 2.0 Offline Editor",