From b48411a8e429f107877c2c5ef53908c5ab19b4ca Mon Sep 17 00:00:00 2001 From: chrisgarrity Date: Tue, 19 Sep 2017 08:19:36 -0400 Subject: [PATCH 1/3] Link to pt-br downloads if locale is pt-br --- src/views/download/download.jsx | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/views/download/download.jsx b/src/views/download/download.jsx index 8eca5196b..fe774218d 100644 --- a/src/views/download/download.jsx +++ b/src/views/download/download.jsx @@ -3,6 +3,7 @@ var render = require('../../lib/render.jsx'); var FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage; var FormattedMessage = require('react-intl').FormattedMessage; +var injectIntl = require('react-intl').injectIntl; var api = require('../../lib/api'); var Page = require('../../components/page/www/page.jsx'); @@ -21,9 +22,13 @@ var Download = React.createClass({ }; }, componentDidMount: function () { + var uri = '/scratchr2/static/sa/version.xml'; + if (this.props.intl.locale === 'pt-br') { + uri = '/scratchr2/static/sa/pt-br/version.xml'; + } api({ host: '', - uri: '/scratchr2/static/sa/version.xml', + uri: uri, responseType: 'string' }, function (err, body, res) { if (err || res.statusCode >= 400) { @@ -39,12 +44,16 @@ var Download = React.createClass({ }.bind(this)); }, render: function () { + var downloadPath = '/scratchr2/static/sa/Scratch-'; + if (this.props.intl.locale === 'pt-br') { + downloadPath = '/scratchr2/static/sa/pt-br/Scratch-'; + } if (this.state.swfVersion.length > 0 && this.state.swfVersion !== -1) { var downloadUrls = { - mac: '/scratchr2/static/sa/Scratch-'+ this.state.swfVersion + '.dmg', - mac105: '/scratchr2/static/sa/Scratch-'+ this.state.swfVersion + '.air', - windows: '/scratchr2/static/sa/Scratch-'+ this.state.swfVersion + '.exe', - linux: '/scratchr2/static/sa/Scratch-'+ this.state.swfVersion + '.air' + mac: downloadPath + this.state.swfVersion + '.dmg', + mac105: downloadPath + this.state.swfVersion + '.air', + windows: downloadPath + this.state.swfVersion + '.exe', + linux: downloadPath + this.state.swfVersion + '.air' }; } @@ -233,4 +242,5 @@ var Download = React.createClass({ } }); -render(, document.getElementById('app')); +var IntlDownload = injectIntl(Download); +render(, document.getElementById('app')); From 8b055d894c73599b6853babeacbc3528ed4105e8 Mon Sep 17 00:00:00 2001 From: chrisgarrity Date: Tue, 19 Sep 2017 11:15:02 -0400 Subject: [PATCH 2/3] follow injectIntl convention wrap the createClass with injectIntl to be consistent with other uses in www --- src/views/download/download.jsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/views/download/download.jsx b/src/views/download/download.jsx index fe774218d..2413a2227 100644 --- a/src/views/download/download.jsx +++ b/src/views/download/download.jsx @@ -14,7 +14,7 @@ var SubNavigation = require('../../components/subnavigation/subnavigation.jsx'); require('./download.scss'); require('../../components/forms/button.scss'); -var Download = React.createClass({ +var Download = injectIntl(React.createClass({ type: 'Download', getInitialState: function () { return { @@ -240,7 +240,6 @@ var Download = React.createClass({ ); } -}); +})); -var IntlDownload = injectIntl(Download); -render(, document.getElementById('app')); +render(, document.getElementById('app')); From 13284dee21881d100e67595418744b48ef0b8262 Mon Sep 17 00:00:00 2001 From: chrisgarrity Date: Mon, 25 Sep 2017 17:16:58 -0400 Subject: [PATCH 3/3] Rename AnimateYourNameGuide to NameGuide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit remove obsolete static URL so localizations get picked up correctly. git-ignore localized-urls.json as it’s pulled from scratch-resources now. --- .gitignore | 1 + bin/lib/localized-urls.json | 113 -------------------------------- src/views/tips/l10n-static.json | 1 - src/views/tips/ttt.json | 2 +- 4 files changed, 2 insertions(+), 115 deletions(-) delete mode 100644 bin/lib/localized-urls.json diff --git a/.gitignore b/.gitignore index 0eed05504..7eef51192 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ ENV # Test /.nyc_output /coverage +/bin/lib/localized-urls.json diff --git a/bin/lib/localized-urls.json b/bin/lib/localized-urls.json deleted file mode 100644 index ddccf3e18..000000000 --- a/bin/lib/localized-urls.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "ar": { - "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/ar/Scratch2Cards.pdf" - }, - "ca": { - "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/ca/Scratch2Cards.pdf", - "cards.ScratchCardsAllLink": "https://resources.scratch.mit.edu/www/cards/ca/ScratchCardsAll.pdf", - "cards.catchCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/catchCards.pdf", - "cards.danceCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/danceCards.pdf", - "cards.fashionCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/fashionCards.pdf", - "cards.flyCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/flyCards.pdf", - "cards.hide-seekCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/hide-seekCards.pdf", - "cards.musicCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/musicCards.pdf", - "cards.nameCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/nameCards.pdf", - "cards.petCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/petCards.pdf", - "cards.pongCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/pongCards.pdf", - "cards.raceCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/raceCards.pdf", - "cards.storyCardsLink": "https://resources.scratch.mit.edu/www/cards/ca/storyCards.pdf" - }, - "cs": { - "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/cs/Scratch2Cards.pdf" - }, - "de": { - "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/de/Scratch2Cards.pdf" - }, - "en": { - "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/en/Scratch2Cards.pdf", - "cards.ScratchCardsAllLink": "https://resources.scratch.mit.edu/www/cards/en/ScratchCardsAll.pdf", - "cards.catchCardsLink": "https://resources.scratch.mit.edu/www/cards/en/catchCards.pdf", - "cards.danceCardsLink": "https://resources.scratch.mit.edu/www/cards/en/danceCards.pdf", - "cards.dressupCardsLink": "https://resources.scratch.mit.edu/www/cards/en/dressupCards.pdf", - "cards.fashionCardsLink": "https://resources.scratch.mit.edu/www/cards/en/fashionCards.pdf", - "cards.flyCardsLink": "https://resources.scratch.mit.edu/www/cards/en/flyCards.pdf", - "cards.hide-seekCardsLink": "https://resources.scratch.mit.edu/www/cards/en/hide-seekCards.pdf", - "cards.musicCardsLink": "https://resources.scratch.mit.edu/www/cards/en/musicCards.pdf", - "cards.nameCardsLink": "https://resources.scratch.mit.edu/www/cards/en/nameCards.pdf", - "cards.petCardsLink": "https://resources.scratch.mit.edu/www/cards/en/petCards.pdf", - "cards.pongCardsLink": "https://resources.scratch.mit.edu/www/cards/en/pongCards.pdf", - "cards.raceCardsLink": "https://resources.scratch.mit.edu/www/cards/en/raceCards.pdf", - "cards.storyCardsLink": "https://resources.scratch.mit.edu/www/cards/en/storyCards.pdf", - "guides.AnimateYourNameGuideLink": "https://resources.scratch.mit.edu/www/guides/en/AnimateYourNameGuide.pdf", - "guides.CatchGuideLink": "https://resources.scratch.mit.edu/www/guides/en/CatchGuide.pdf", - "guides.DanceGuideLink": "https://resources.scratch.mit.edu/www/guides/en/DanceGuide.pdf", - "guides.FashionGuideLink": "https://resources.scratch.mit.edu/www/guides/en/FashionGuide.pdf", - "guides.FlyGuideLink": "https://resources.scratch.mit.edu/www/guides/en/FlyGuide.pdf", - "guides.Getting-Started-Guide-Scratch2Link": "https://resources.scratch.mit.edu/www/guides/en/Getting-Started-Guide-Scratch2.pdf", - "guides.HideandSeekGuideLink": "https://resources.scratch.mit.edu/www/guides/en/HideandSeekGuide.pdf", - "guides.MusicGuideLink": "https://resources.scratch.mit.edu/www/guides/en/MusicGuide.pdf", - "guides.NameGuideLink": "https://resources.scratch.mit.edu/www/guides/en/NameGuide.pdf", - "guides.PetGuideLink": "https://resources.scratch.mit.edu/www/guides/en/PetGuide.pdf", - "guides.PongGuideLink": "https://resources.scratch.mit.edu/www/guides/en/PongGuide.pdf", - "guides.RaceGuideLink": "https://resources.scratch.mit.edu/www/guides/en/RaceGuide.pdf", - "guides.StoryGuideLink": "https://resources.scratch.mit.edu/www/guides/en/StoryGuide.pdf" - }, - "es": { - "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/es/Scratch2Cards.pdf", - "cards.catchCardsLink": "https://resources.scratch.mit.edu/www/cards/es/catchCards.pdf", - "cards.danceCardsLink": "https://resources.scratch.mit.edu/www/cards/es/danceCards.pdf", - "cards.fashionCardsLink": "https://resources.scratch.mit.edu/www/cards/es/fashionCards.pdf", - "cards.flyCardsLink": "https://resources.scratch.mit.edu/www/cards/es/flyCards.pdf", - "cards.hide-seekCardsLink": "https://resources.scratch.mit.edu/www/cards/es/hide-seekCards.pdf", - "cards.musicCardsLink": "https://resources.scratch.mit.edu/www/cards/es/musicCards.pdf", - "cards.nameCardsLink": "https://resources.scratch.mit.edu/www/cards/es/nameCards.pdf", - "cards.petCardsLink": "https://resources.scratch.mit.edu/www/cards/es/petCards.pdf", - "cards.pongCardsLink": "https://resources.scratch.mit.edu/www/cards/es/pongCards.pdf", - "cards.raceCardsLink": "https://resources.scratch.mit.edu/www/cards/es/raceCards.pdf", - "cards.storyCardsLink": "https://resources.scratch.mit.edu/www/cards/es/storyCards.pdf" - }, - "fr": { - "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/fr/Scratch2Cards.pdf" - }, - "hr": { - "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/hr/Scratch2Cards.pdf" - }, - "it": { - "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/it/Scratch2Cards.pdf" - }, - "ja": { - "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/ja/Scratch2Cards.pdf" - }, - "ja-hr": { - "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/ja-hr/Scratch2Cards.pdf" - }, - "ko": { - "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/ko/Scratch2Cards.pdf" - }, - "nl": { - "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/nl/Scratch2Cards.pdf" - }, - "pt-br": { - "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/pt-br/Scratch2Cards.pdf" - }, - "sl": { - "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/sl/Scratch2Cards.pdf" - }, - "sv": { - "cards.Scratch2CardsLink": "https://resources.scratch.mit.edu/www/cards/sv/Scratch2Cards.pdf" - }, - "zh-tw": { - "cards.ScratchCardsAllLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/ScratchCardsAll.pdf", - "cards.catchCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/catchCards.pdf", - "cards.danceCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/danceCards.pdf", - "cards.fashionCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/fashionCards.pdf", - "cards.flyCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/flyCards.pdf", - "cards.hide-seekCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/hide-seekCards.pdf", - "cards.musicCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/musicCards.pdf", - "cards.nameCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/nameCards.pdf", - "cards.petCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/petCards.pdf", - "cards.pongCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/pongCards.pdf", - "cards.raceCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/raceCards.pdf", - "cards.storyCardsLink": "https://resources.scratch.mit.edu/www/cards/zh-tw/storyCards.pdf" - } -} \ No newline at end of file diff --git a/src/views/tips/l10n-static.json b/src/views/tips/l10n-static.json index 19d5ca096..8792f7d3a 100644 --- a/src/views/tips/l10n-static.json +++ b/src/views/tips/l10n-static.json @@ -13,7 +13,6 @@ "cards.pongCardsLink": "https://resources.scratch.mit.edu/www/cards/en/pongCards.pdf", "cards.raceCardsLink": "https://resources.scratch.mit.edu/www/cards/en/raceCards.pdf", "cards.storyCardsLink": "https://resources.scratch.mit.edu/www/cards/en/storyCards.pdf", - "guides.AnimateYourNameGuideLink": "https://resources.scratch.mit.edu/www/guides/en/AnimateYourNameGuide.pdf", "guides.CatchGuideLink": "https://resources.scratch.mit.edu/www/guides/en/CatchGuide.pdf", "guides.DanceGuideLink": "https://resources.scratch.mit.edu/www/guides/en/DanceGuide.pdf", "guides.FashionGuideLink": "https://resources.scratch.mit.edu/www/guides/en/FashionGuide.pdf", diff --git a/src/views/tips/ttt.json b/src/views/tips/ttt.json index bdfdb9502..013ff9d7b 100644 --- a/src/views/tips/ttt.json +++ b/src/views/tips/ttt.json @@ -6,7 +6,7 @@ "bannerUrl": "/images/ttt/animate-your-name-banner.jpg", "tutorialLoc": "/projects/editor/?tip_bar=name", "activityLoc": "cards.nameCardsLink", - "guideLoc": "guides.AnimateYourNameGuideLink" + "guideLoc": "guides.NameGuideLink" }, { "title": "ttt.MakeItFlyTitle",