Skip to content

GitLab

S
scratch-www
Commit 43add1ad authored by Matthew Taylor's avatar Matthew Taylor
Browse files
Options

Clean up some intl formatting 

remove `defaultMessage` from inline, which we don’t use right now
parent 41a0ef73
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 44 deletions
src/views/splash/splash.jsx
View file @ 43add1ad
...@@ -189,16 +189,12 @@ var Splash = injectIntl(React.createClass({ ...@@ -189,16 +189,12 @@ var Splash = injectIntl(React.createClass({
var rows = [ var rows = [
<Box <Box
title={formatMessage({ title={formatMessage({id: 'splash.featuredProjects'})}
id: 'splash.featuredProjects',
defaultMessage: 'Featured Projects'})}
key="community_featured_projects"> key="community_featured_projects">
<Carousel items={this.state.featuredGlobal.community_featured_projects} /> <Carousel items={this.state.featuredGlobal.community_featured_projects} />
</Box>, </Box>,
<Box <Box
title={formatMessage({ title={formatMessage({id: 'splash.featuredStudios'})}
id: 'splash.featuredStudios',
defaultMessage: 'Featured Studios'})}
key="community_featured_studios"> key="community_featured_studios">
<Carousel items={this.state.featuredGlobal.community_featured_studios} <Carousel items={this.state.featuredGlobal.community_featured_studios}
settings={{slidesToShow: 4, slidesToScroll: 4, lazyLoad: false}} /> settings={{slidesToShow: 4, slidesToScroll: 4, lazyLoad: false}} />
...@@ -216,8 +212,8 @@ var Splash = injectIntl(React.createClass({ ...@@ -216,8 +212,8 @@ var Splash = injectIntl(React.createClass({
this.state.featuredGlobal.curator_top_projects[0].curator_name} this.state.featuredGlobal.curator_top_projects[0].curator_name}
moreTitle={formatMessage({id: 'general.learnMore', defaultMessage: 'Learn More'})} moreTitle={formatMessage({id: 'general.learnMore', defaultMessage: 'Learn More'})}
moreHref="/studios/386359/"> moreHref="/studios/386359/">
<Carousel
items={this.state.featuredGlobal.curator_top_projects} /> <Carousel items={this.state.featuredGlobal.curator_top_projects} />
</Box> </Box>
); );
} }
...@@ -229,14 +225,12 @@ var Splash = injectIntl(React.createClass({ ...@@ -229,14 +225,12 @@ var Splash = injectIntl(React.createClass({
<Box <Box
key="scratch_design_studio" key="scratch_design_studio"
title={ title={
formatMessage({ formatMessage({id: 'splash.scratchDesignStudioTitle'})
id: 'splash.scratchDesignStudioTitle',
defaultMessage: 'Scratch Design Studio' })
+ ' - ' + this.state.featuredGlobal.scratch_design_studio[0].gallery_title} + ' - ' + this.state.featuredGlobal.scratch_design_studio[0].gallery_title}
moreTitle={formatMessage({id: 'splash.visitTheStudio', defaultMessage: 'Visit the studio'})} moreTitle={formatMessage({id: 'splash.visitTheStudio', defaultMessage: 'Visit the studio'})}
moreHref={'/studios/' + this.state.featuredGlobal.scratch_design_studio[0].gallery_id + '/'}> moreHref={'/studios/' + this.state.featuredGlobal.scratch_design_studio[0].gallery_id + '/'}>
<Carousel
items={this.state.featuredGlobal.scratch_design_studio} /> <Carousel items={this.state.featuredGlobal.scratch_design_studio} />
</Box> </Box>
); );
} }
...@@ -246,14 +240,9 @@ var Splash = injectIntl(React.createClass({ ...@@ -246,14 +240,9 @@ var Splash = injectIntl(React.createClass({
this.state.featuredGlobal.community_newest_projects.length > 0) { this.state.featuredGlobal.community_newest_projects.length > 0) {
rows.push( rows.push(
<Box <Box title={formatMessage({id: 'splash.recentlySharedProjects'})}
title={ key="community_newest_projects">
formatMessage({ <Carousel items={this.state.featuredGlobal.community_newest_projects} />
id: 'splash.recentlySharedProjects',
defaultMessage: 'Recently Shared Projects' })}
key="community_newest_projects">
<Carousel
items={this.state.featuredGlobal.community_newest_projects} />
</Box> </Box>
); );
} }
...@@ -262,12 +251,9 @@ var Splash = injectIntl(React.createClass({ ...@@ -262,12 +251,9 @@ var Splash = injectIntl(React.createClass({
this.state.featuredCustom.custom_projects_by_following.length > 0) { this.state.featuredCustom.custom_projects_by_following.length > 0) {
rows.push( rows.push(
<Box title={ <Box title={formatMessage({id: 'splash.projectsByScratchersFollowing'})}
formatMessage({
id: 'splash.projectsByScratchersFollowing',
defaultMessage: 'Projects by Scratchers I\'m Following'})}
key="custom_projects_by_following"> key="custom_projects_by_following">
<Carousel items={this.state.featuredCustom.custom_projects_by_following} /> <Carousel items={this.state.featuredCustom.custom_projects_by_following} />
</Box> </Box>
); );
...@@ -276,12 +262,9 @@ var Splash = injectIntl(React.createClass({ ...@@ -276,12 +262,9 @@ var Splash = injectIntl(React.createClass({
this.state.featuredCustom.custom_projects_loved_by_following.length > 0) { this.state.featuredCustom.custom_projects_loved_by_following.length > 0) {
rows.push( rows.push(
<Box title={ <Box title={formatMessage({id: 'splash.projectsLovedByScratchersFollowing'})}
formatMessage({
id: 'splash.projectsLovedByScratchersFollowing',
defaultMessage: 'Projects Loved by Scratchers I\'m Following'})}
key="custom_projects_loved_by_following"> key="custom_projects_loved_by_following">
<Carousel items={this.state.featuredCustom.custom_projects_loved_by_following} /> <Carousel items={this.state.featuredCustom.custom_projects_loved_by_following} />
</Box> </Box>
); );
...@@ -291,31 +274,22 @@ var Splash = injectIntl(React.createClass({ ...@@ -291,31 +274,22 @@ var Splash = injectIntl(React.createClass({
this.state.featuredCustom.custom_projects_in_studios_following.length > 0) { this.state.featuredCustom.custom_projects_in_studios_following.length > 0) {
rows.push( rows.push(
<Box title={ <Box title={formatMessage({id:'splash.projectsInStudiosFollowing'})}
formatMessage({
id:'splash.projectsInStudiosFollowing',
defaultMessage: 'Projects in Studios I\'m Following'})}
key="custom_projects_in_studios_following"> key="custom_projects_in_studios_following">
<Carousel items={this.state.featuredCustom.custom_projects_in_studios_following} /> <Carousel items={this.state.featuredCustom.custom_projects_in_studios_following} />
</Box> </Box>
); );
} }
rows.push( rows.push(
<Box title={ <Box title={formatMessage({id: 'splash.communityRemixing'})}
formatMessage({
id: 'splash.communityRemixing',
defaultMessage: 'What the Community is Remixing' })}
key="community_most_remixed_projects"> key="community_most_remixed_projects">
<Carousel items={shuffle(this.state.featuredGlobal.community_most_remixed_projects)} <Carousel items={shuffle(this.state.featuredGlobal.community_most_remixed_projects)}
showRemixes={true} /> showRemixes={true} />
</Box>, </Box>,
<Box title={ <Box title={formatMessage({id: 'splash.communityLoving'})}
formatMessage({
id: 'splash.communityLoving',
defaultMessage: 'What the Community is Loving' })}
key="community_most_loved_projects"> key="community_most_loved_projects">
<Carousel items={shuffle(this.state.featuredGlobal.community_most_loved_projects)} <Carousel items={shuffle(this.state.featuredGlobal.community_most_loved_projects)}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment