- {CHROME_APP_RELEASED ? (
-
- ) : (
-
- {isDownloaded(currentOS) && (
-
- )}
- {isFromGooglePlay(currentOS) && (
-
- )}
-
- )}
+
);
diff --git a/src/l10n.json b/src/l10n.json
index ab2e30ee6..bb197850f 100644
--- a/src/l10n.json
+++ b/src/l10n.json
@@ -140,10 +140,7 @@
"installScratch.or": "or",
"installScratch.directDownload": "Direct download",
- "installScratch.desktopHeaderTitle": "Install Scratch Desktop",
"installScratch.appHeaderTitle": "Install the Scratch app for {operatingsystem}",
- "installScratch.downloadScratchDesktop": "Download Scratch Desktop",
- "installScratch.downloadScratchAppGeneric": "Download Scratch for {operatingsystem}",
"installScratch.getScratchAppPlay": "Get the Scratch app on the Google Play Store",
"installScratch.getScratchAppMacOs": "Get the Scratch app on the Mac App Store",
"installScratch.getScratchAppWindows": "Get the Scratch app on the Microsoft Store",
diff --git a/src/lib/detect-os.js b/src/lib/detect-os.js
index fa94c3229..2e7f425fc 100644
--- a/src/lib/detect-os.js
+++ b/src/lib/detect-os.js
@@ -1,6 +1,5 @@
import bowser from 'bowser';
import OS_ENUM from './os-enum.js';
-import {CHROME_APP_RELEASED} from './feature-flags.js';
/**
* Helper function to the current Operating System.
@@ -9,10 +8,8 @@ import {CHROME_APP_RELEASED} from './feature-flags.js';
export default function () {
// matching OS strings from https://github.com/lancedikson/bowser/blob/master/src/constants.js
if (bowser.osname === 'macOS') return OS_ENUM.MACOS;
- if (CHROME_APP_RELEASED) {
- if (bowser.osname === 'Chrome OS') return OS_ENUM.CHROMEOS;
- if (bowser.osname === 'Android') return OS_ENUM.ANDROID;
- }
+ if (bowser.osname === 'Chrome OS') return OS_ENUM.CHROMEOS;
+ if (bowser.osname === 'Android') return OS_ENUM.ANDROID;
// if (bowser.osname === 'iOS') return OS_ENUM.IOS; // @todo
return OS_ENUM.WINDOWS;
}
diff --git a/src/lib/feature-flags.js b/src/lib/feature-flags.js
index 009c37464..4d77845d9 100644
--- a/src/lib/feature-flags.js
+++ b/src/lib/feature-flags.js
@@ -8,5 +8,4 @@ const flagInUrl = flag => {
};
module.exports = {
- CHROME_APP_RELEASED: true
};
diff --git a/src/views/download/download.jsx b/src/views/download/download.jsx
index 49664936b..26f0538bb 100644
--- a/src/views/download/download.jsx
+++ b/src/views/download/download.jsx
@@ -10,7 +10,6 @@ const Page = require('../../components/page/www/page.jsx');
const render = require('../../lib/render.jsx');
const detectOS = require('../../lib/detect-os.js').default;
const OS_ENUM = require('../../lib/os-enum.js');
-const {CHROME_APP_RELEASED} = require('../../lib/feature-flags.js');
const OSChooser = require('../../components/os-chooser/os-chooser.jsx');
const InstallScratch = require('../../components/install-scratch/install-scratch.jsx');
const {isDownloaded, isFromGooglePlay} = require('../../components/install-scratch/install-util.js');
@@ -52,14 +51,12 @@ class Download extends React.Component {
width="40"
/>
@@ -82,24 +79,20 @@ class Download extends React.Component {
/>
macOS 10.13+
- {CHROME_APP_RELEASED && (
-
-
-
+
+
ChromeOS
-
-
-
+
+
+
Android 6.0+
-
-
- )}
+
diff --git a/src/views/download/l10n.json b/src/views/download/l10n.json
index 73118a67c..2de1f8572 100644
--- a/src/views/download/l10n.json
+++ b/src/views/download/l10n.json
@@ -1,6 +1,4 @@
{
- "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.appTitle": "Download the Scratch App",
"download.appIntro": "Would you like to create and save Scratch projects without an internet connection? Download the free Scratch app.",
"download.requirements": "Requirements",
@@ -23,7 +21,7 @@
"download.macMoveToApplications" : "Open the .dmg file. Move Scratch Desktop into Applications.",
"download.winMoveToApplications" : "Run the .exe file.",
"download.doIHaveToDownload" : "Do I have to download an app to use Scratch?",
- "download.doIHaveToDownloadAnswer" : "No. You can also use the Scratch project editor in any web browser on any device by going to scratch.mit.edu and clicking \"Create\".",
+ "download.doIHaveToDownloadAnswer" : "No. You can also use the Scratch project editor in most web browsers on most devices by going to scratch.mit.edu and clicking \"Create\".",
"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.canIUseExtensions" : "Can I connect to hardware extensions?",