Merge pull request #1886 from thisandagain/bugfix/1880

Remove references to Linux for the Scratch 2.0 offline editor
scratchfoundation · May 16, 2018 · a418935 · a418935
2 parents c6e4b2e + 32fc959
commit a418935
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git 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
@@ -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 {
                                                 <FormattedMessage id="download.download" />
                                             </a>
                                         </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>
                                 </div>
                                 <div className="installation-column">
@@ -180,12 +173,6 @@ class Download extends React.Component {
                                                     <FormattedMessage id="download.download" />
                                                 </a>
                                             </li>
-                                            <li className="installation-downloads-item">
-                                                <FormattedMessage id="download.linux" /> -
-                                                {' '}<a href={downloadUrls.linux}>
-                                                    <FormattedMessage id="download.download" />
-                                                </a>
-                                            </li>
                                         </ul>
                                     ]}
                                     {this.state.swfVersion === -1 ? [

diff --git a/src/views/download/l10n.json b/src/views/download/l10n.json
@@ -1,14 +1,13 @@
 {
   "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.installation": "Installation",
   "download.airTitle": "Adobe AIR",
   "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.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",