scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 00:21:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #3681 from LLK/release/2020-02-05

Browse source 
[MASTER] Release/2020-02-05
This commit is contained in:
DD Liu 2020-02-06 14:18:52 -05:00 committed by GitHub
commit 2caafe32bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 531 additions and 510 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1016
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -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.20200129184440",
"scratch-gui": "0.1.0-prerelease.20200206175826",
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",

1
src/l10n.json
View file

@ -293,6 +293,7 @@
"comments.isDisallowed": "Hmm, it looks like comments have been turned off for this page. :/",
"comments.isIPMuted": "Sorry, the Scratch Team had to prevent your network from sharing comments or projects because it was used to break our community guidelines too many times. You can still share comments and projects from another network. If you'd like to appeal this block, you can contact appeals@scratch.mit.edu and reference Case Number {appealId}.",
"comments.isTooLong": "That comment is too long! Please find a way to shorten your text.",
"comments.isNotPermitted": "Sorry, you need to confirm your email address before commenting.",
"comments.error": "Oops! Something went wrong posting your comment",
"comments.posting": "Posting...",
"comments.post": "Post",

19
src/views/download/download.jsx
View file

@ -237,7 +237,24 @@ class Download extends React.Component {
<p>
<FormattedMessage id="download.onPhoneAnswer" />
</p>
<h3 className="faq-question">
<FormattedMessage id="download.howUpdateApp" />
</h3>
{isDownloaded(this.state.OS) && (
<p>
<FormattedMessage
id="download.howUpdateAppAnswerDownload"
values={{operatingsystem: this.state.OS}}
/>
</p>
)}
{isFromGooglePlay(this.state.OS) && (
<p>
<FormattedMessage
id="download.howUpdateAppAnswerPlayStore"
/>
</p>
)}
<h3 className="faq-question">
<FormattedMessage id="download.whenSupportLinuxApp" />
</h3>

3
src/views/download/l10n.json
View file

@ -36,6 +36,9 @@
"download.yesAnswer" : "Yes.",
"download.onPhone": "Can I install Scratch on my Android phone?",
"download.onPhoneAnswer" : "No. The current version of Scratch for Android only works on tablets.",
"download.howUpdateApp" : "How do I update the Scratch app?",
"download.howUpdateAppAnswerPlayStore" : "Open the Google Play store and check for updates. If your installation is managed by school administrators, they will need to update the version and make the update available to managed devices.",
"download.howUpdateAppAnswerDownload" : "To update Scratch for {operatingsystem} from this page, download the latest version and install. To check which version you have, click the Scratch logo in the downloaded app.",
"download.canIShare": "Can I share from Scratch Desktop?",
"download.canIShareAnswer": "This isn’t supported currently. For now, you can save a project from Scratch Desktop, upload it to your Scratch account, and share it there. In a later version we will add the ability to upload to your Scratch account directly in Scratch Desktop.",
"download.canIShareApp": "Can I share to the online community from the Scratch app for {operatingsystem}?",