Merge pull request #4176 from LLK/develop

Update release branch from develop

package.json

@@ -128,7 +128,7 @@
     "redux-mock-store": "^1.2.3",
     "redux-thunk": "2.0.1",
     "sass-loader": "6.0.6",
-    "scratch-gui": "0.1.0-prerelease.20200622200348",
+    "scratch-gui": "0.1.0-prerelease.20200708034512",
     "scratch-l10n": "latest",
     "selenium-webdriver": "3.6.0",
     "slick-carousel": "1.6.0",

src/components/join-flow/username-step.jsx

@@ -34,7 +34,7 @@ class UsernameStep extends React.Component {
         };
         // simple object to memoize remote requests for usernames.
         // keeps us from submitting multiple requests for same data.
-        this.usernameRemoteCache = {};
+        this.usernameRemoteCache = Object.create(null);
     }
     componentDidMount () {
         // Send info to analytics when we aren't on the standalone page.
@@ -58,7 +58,7 @@ class UsernameStep extends React.Component {
     }
     // simple function to memoize remote requests for usernames
     validateUsernameRemotelyWithCache (username) {
-        if (this.usernameRemoteCache.hasOwnProperty(username)) {
+        if (typeof this.usernameRemoteCache[username] === 'object') {
             return Promise.resolve(this.usernameRemoteCache[username]);
         }
         // username is not in our cache

src/components/modal/addtostudio/modal.scss

@@ -34,10 +34,8 @@
     background-color: $ui-blue-10percent;
     flex: 1;
     height: calc(100% - 5rem);
-
-    @media #{$small-height} {
-        min-height: 0;
-    }
+    /* Firefox requires min-height:0: #3775 */
+    min-height: 0;
 }
 
 .studio-list-inner-scrollbox {

src/lib/decorate-text.jsx

@@ -24,7 +24,7 @@ module.exports = (text, opts) => {
     if (opts.usernames) {
         replacedText = reactStringReplace(replacedText, /@([\w-]+)/g, (match, i) => (
             <a
-                href={`/users/${match}`}
+                href={match.toLowerCase() === 'welcomingcommittee' ? '/studios/146521/' : `/users/${match}`}
                 key={match + i}
             >@{match}</a>
         ));

src/routes.json

@@ -434,6 +434,12 @@
         "routeAlias": "/info/?(\\?.*)?$",
         "redirect": "/ideas"
     },
+    {
+        "name": "register-redirect",
+        "pattern": "^/accounts/standalone-registration/?$",
+        "routeAlias": "/accounts/standalone-registration/",
+        "redirect": "/join"
+    },
     {
         "name": "research-redirect",
         "pattern": "^/info/research/?$",

src/views/credits/credits.jsx

@@ -109,7 +109,7 @@ const Credits = () => (
                         id="credits.acknowledgementsTranslators"
                         values={{
                             translatorsLink: (
-                                <a href="http://wiki.scratch.mit.edu/wiki/Translators">
+                                <a href="https://en.scratch-wiki.info/wiki/Translators">
                                     <FormattedMessage id="credits.acknowledgementsTranslatorsLinkText" />
                                 </a>
                             )
@@ -151,8 +151,8 @@ const Credits = () => (
                     {' '}
                     Ben Berg, Amos Blanton, Karen Brennan, Juanita Buitrago,
                     Leo Burd, Gaia Carini, Kasia Chmielinski, Michelle Chung,
-                    Shane Clements, Hannah Cole, Ellen Daoust, Sayamindu Dasgupta,
-                    Margarita Dekoli, Dave Feinberg, Linda Fernsel,
+                    Shane Clements, Hannah Cole, Sayamindu Dasgupta,
+                    Margarita Dekoli, Dave Feinberg, Linda Fernsel, Elizabeth Foster,
                     Chris Graves, Joel Gritter, Megan Haddadi, Connor Hudson,
                     Christina Huang, Tony Hwang, Abdulrahman Idlbi, Randy Jou,
                     Lily Kim, Tauntaun Kim, Saskia Leggett, Tim Mickel,

src/views/credits/people.json

 [
+    {
+        "userName": "originalwow",
+        "userId": 56182496,
+        "name": "Amielle"
+    },
     {
         "userName": "amylaser",
         "userId": 17462181,
@@ -53,9 +58,14 @@
         "userName": "codubee",
         "userId": 10866958,
         "name": "Colby"
+    },
+     {
+        "userName": "noncanonical",
+        "userId": 55851826,
+        "name": "Craig"
     },
     {
-        "userName": "harakou",
+        "userName": "Harakou",
         "userId": 373646,
         "name": "Dalton"
     },
@@ -65,9 +75,9 @@
         "name": "DD"
     },
     {
-        "userName": "rmiel",
-        "userId": 34557192,
-        "name": "Elizabeth"
+        "userName": "SunnyDay4aBlueJay",
+        "userId": 24164779,
+        "name": "Ellen"
     },
     {
         "userName": "ericr",
@@ -104,6 +114,11 @@
         "userId": 2496866,
         "name": "Jolie"
     },
+    {
+        "userName": "Class12321",
+        "userId": 2871308,
+        "name": "Joshua"
+    },
     {
         "userName": "bluecrazie",
         "userId": 50257624,

src/views/download/l10n.json

@@ -50,5 +50,6 @@
   "download.whyAskForLocation" : "Why is {operatingsystem} asking for my location?",
   "download.whyAskForLocationAnswer" : "Scratch uses bluetooth to connect to other devices, such as a micro:bit or LEGO BOOST.  Bluetooth can be used to provide location data to the app, so Google requires every app that uses bluetooth ask users for permission to access their location. Scratch will not use bluetooth to track your location.",
   "download.whereProjectStored" : "Where does the Scratch App store my projects?",
-  "download.whereProjectStoredAnswer" : "Projects are saved internally in the app. To export a project file, click the 3-dot menu and select \"Share\". On the next screen select \"export\". The options visible depend on the applications installed on your device. Common options are Google Drive, Files, and email."
+  "download.whereProjectStoredAnswer" : "Projects are saved internally in the app. To export a project file, click the 3-dot menu and select \"Share\". On the next screen select \"export\". The options visible depend on the applications installed on your device. Common options are Google Drive, Files, and email.",
+  "download.iconAltText" : "Download"
 }

src/views/preview/preview.scss

@@ -38,7 +38,6 @@ $stage-width: 480px;
 
     .inner {
         margin: 0 auto;
-        overflow: auto;
 
         @media #{$medium-and-smaller} {
             // subtract page padding
@@ -365,7 +364,7 @@ $stage-width: 480px;
     .guiPlayer {
         display: inline-block;
         position: relative;
-        max-width: $player-width;
+        width: $player-width;
         z-index: 1;
 
         $alert-bg: rgba(255, 255, 255, .85);
@@ -402,6 +401,7 @@ $stage-width: 480px;
         flex: 1;
         flex-flow: column;
         margin-top: .3125rem;
+        overflow: auto;
 
         @media #{$medium-and-smaller} {
             margin-top: .5rem;
@@ -479,7 +479,6 @@ $stage-width: 480px;
         line-height: 1.5rem;
         flex: 1;
         overflow-wrap: break-word;
-        word-break: break-word;
     }
 
     .project-description:last-of-type {

src/views/splash/splash.scss

@@ -104,6 +104,8 @@
 .social-message {
     border: 0;
     padding: 0;
+    overflow-wrap: anywhere;
+    word-break: break-word;
 }
 
 .activity-img {