From c4b3bac2fc0eec6231f4937d457664b5c32bf08c Mon Sep 17 00:00:00 2001 From: Paul Kaplan Date: Fri, 6 Jul 2018 11:51:57 -0400 Subject: [PATCH 1/2] Update scratch paint to fix reshape tool bug --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 24b2fabe5..e024f60a2 100644 --- a/package.json +++ b/package.json @@ -97,11 +97,11 @@ "scratch-audio": "0.1.0-prerelease.20180625202813", "scratch-blocks": "0.1.0-prerelease.1530135682", "scratch-l10n": "3.0.20180611175036", - "scratch-paint": "0.2.0-prerelease.20180629115559", + "scratch-paint": "0.2.0-prerelease.20180706154930", "scratch-audio": "0.1.0-prerelease.20180625202813", "scratch-blocks": "0.1.0-prerelease.1530135682", "scratch-l10n": "3.0.20180627134459", - "scratch-paint": "0.2.0-prerelease.20180629115559", + "scratch-paint": "0.2.0-prerelease.20180706154930", "scratch-render": "0.1.0-prerelease.20180618173030", "scratch-storage": "0.5.1", "scratch-svg-renderer": "0.2.0-prerelease.20180618172917", From fd64c9004f5171d65d977d24168cd608ea1fae27 Mon Sep 17 00:00:00 2001 From: chrisgarrity Date: Mon, 23 Jul 2018 16:48:13 -0400 Subject: [PATCH 2/2] Temporarily exclude RTL languages from the menu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently that’s just hebrew. It’s still available with the `?locale=he` for people to check translations. It’s being temporarily excluded from the menu until we have RTL support for the interface. --- .../language-selector/language-selector.jsx | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/components/language-selector/language-selector.jsx b/src/components/language-selector/language-selector.jsx index ad7a9aa90..a6707bbce 100644 --- a/src/components/language-selector/language-selector.jsx +++ b/src/components/language-selector/language-selector.jsx @@ -5,6 +5,9 @@ import Box from '../box/box.jsx'; import locales from 'scratch-l10n'; import styles from './language-selector.css'; +// supported languages to exclude from the menu, but allow as a URL option +const ignore = ['he']; + class LanguageSelector extends React.Component { render () { const { @@ -26,14 +29,18 @@ class LanguageSelector extends React.Component { value={currentLocale} onChange={onChange} > - {Object.keys(locales).map(locale => ( - - ))} + { + Object.keys(locales) + .filter(l => !ignore.includes(l)) + .map(locale => ( + + )) + }