From a302d37eef96fe4837e98cd6c7852b3029cf86da Mon Sep 17 00:00:00 2001 From: Andrew Sliwinski Date: Tue, 15 May 2018 10:19:12 -0400 Subject: [PATCH 1/2] Remove references to Linux for the Scratch 2.0 offline editor. Resolves GH-1880 --- src/components/news/news.json | 2 +- src/views/download/download.jsx | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/components/news/news.json b/src/components/news/news.json index c708faf1c10..af28dfb15ba 100644 --- a/src/components/news/news.json +++ b/src/components/news/news.json @@ -2,7 +2,7 @@ { "id": 128283902498, "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", "image": "https://33.media.tumblr.com/695b93f4ab74c68feaef1fe03baebdd5/tumblr_inline_n0xubtT0vU1szpavb.png" }, diff --git a/src/views/download/download.jsx b/src/views/download/download.jsx index 1a9b905bd23..e4a6bef7c0e 100644 --- a/src/views/download/download.jsx +++ b/src/views/download/download.jsx @@ -55,8 +55,7 @@ class Download extends React.Component { downloadUrls = { mac: `${downloadPath}${this.state.swfVersion}.dmg`, mac105: `${downloadPath}${this.state.swfVersion}.air`, - windows: `${downloadPath}${this.state.swfVersion}.exe`, - linux: `${downloadPath}${this.state.swfVersion}.air` + windows: `${downloadPath}${this.state.swfVersion}.exe` }; } @@ -143,12 +142,6 @@ class Download extends React.Component { -
  • - - - {' '} - - -
  • @@ -180,12 +173,6 @@ class Download extends React.Component { -
  • - - - {' '} - - -
  • ]} {this.state.swfVersion === -1 ? [ From 32fc959ed28e5a9d0ddcd24cac6d080d145275b4 Mon Sep 17 00:00:00 2001 From: Andrew Sliwinski Date: Wed, 16 May 2018 09:44:11 -0400 Subject: [PATCH 2/2] Remove references to Linux in download l10n strings --- src/views/download/l10n.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/download/l10n.json b/src/views/download/l10n.json index 48ecdd50c2a..3c514411513 100644 --- a/src/views/download/l10n.json +++ b/src/views/download/l10n.json @@ -1,6 +1,6 @@ { "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": "Note for Mac Users: the latest version of Scratch 2.0 Offline requires Adobe AIR 20. To upgrade to Adobe AIR 20 manually, go here.", "download.installation": "Installation", "download.airTitle": "Adobe AIR", @@ -8,7 +8,6 @@ "download.macOSX": "Mac OS X", "download.macOlder": "Mac OS 10.5 & Older", "download.windows": "Windows", - "download.linux": "Linux", "download.download": "Download", "download.offlineEditorTitle": "Scratch Offline Editor", "download.offlineEditorBody": "Next download and install the Scratch 2.0 Offline Editor",