diff --git a/src/components/thumbnail/thumbnail.jsx b/src/components/thumbnail/thumbnail.jsx
index b2bb234c5..f85dc18c4 100644
--- a/src/components/thumbnail/thumbnail.jsx
+++ b/src/components/thumbnail/thumbnail.jsx
@@ -1,5 +1,6 @@
-var React = require('react');
var classNames = require('classnames');
+var FormattedMessage = require('react-intl').FormattedMessage;
+var React = require('react');
require('./thumbnail.scss');
@@ -32,7 +33,10 @@ var Thumbnail = React.createClass({
if (this.props.creator) {
extra.push(
);
}
diff --git a/src/l10n.json b/src/l10n.json
index 42bd8edb7..6b9041260 100644
--- a/src/l10n.json
+++ b/src/l10n.json
@@ -57,6 +57,7 @@
"general.privacyPolicy": "Privacy Policy",
"general.projects": "Projects",
"general.profile": "Profile",
+ "general.resourcesTitle": "Educator Resources",
"general.scratchConference": "Scratch Conference",
"general.scratchday": "Scratch Day",
"general.scratchEd": "ScratchEd",
@@ -154,5 +155,7 @@
"registration.waitForApprovalDescription": "You can log into your Scratch Account now, but the features specific to Teachers are not yet available. Your information is being reviewed. Please be patient, the approval process can take up to 24 hours. You will receive an email indicating your account has been upgraded once your account has been approved.",
"registration.welcomeStepDescription": "You have successfully set up a Scratch account! You are now a member of the class:",
"registration.welcomeStepPrompt": "To get started, click on the button below.",
- "registration.welcomeStepTitle": "Hurray! Welcome to Scratch!"
+ "registration.welcomeStepTitle": "Hurray! Welcome to Scratch!",
+
+ "thumbnail.by": "by"
}
diff --git a/src/views/explore/explore.jsx b/src/views/explore/explore.jsx
index 761d6292e..2149be580 100644
--- a/src/views/explore/explore.jsx
+++ b/src/views/explore/explore.jsx
@@ -111,10 +111,12 @@ var Explore = injectIntl(React.createClass({
);
},
render: function () {
+ var formatMessage = this.props.intl.formatMessage;
+
return (
-
+
{this.getBubble('all')}
{this.getBubble('animations')}
diff --git a/src/views/splash/l10n.json b/src/views/splash/l10n.json
index 297f35426..f63a65bb8 100644
--- a/src/views/splash/l10n.json
+++ b/src/views/splash/l10n.json
@@ -26,7 +26,6 @@
"teacherbanner.greeting": "Hi",
"teacherbanner.subgreeting": "Teacher Account",
"teacherbanner.classesButton": "My Classes",
- "teacherbanner.resourcesButton": "Educator Resources",
"teacherbanner.faqButton": "Teacher Account FAQ",
"welcome.welcomeToScratch": "Welcome to Scratch!",
diff --git a/src/views/splash/splash.jsx b/src/views/splash/splash.jsx
index 85a2b2b52..919994d12 100644
--- a/src/views/splash/splash.jsx
+++ b/src/views/splash/splash.jsx
@@ -189,16 +189,12 @@ var Splash = injectIntl(React.createClass({
var rows = [
,
@@ -216,8 +212,8 @@ var Splash = injectIntl(React.createClass({
this.state.featuredGlobal.curator_top_projects[0].curator_name}
moreTitle={formatMessage({id: 'general.learnMore', defaultMessage: 'Learn More'})}
moreHref="/studios/386359/">
-
+
+
);
}
@@ -229,14 +225,12 @@ var Splash = injectIntl(React.createClass({
-
+
+
);
}
@@ -246,14 +240,9 @@ var Splash = injectIntl(React.createClass({
this.state.featuredGlobal.community_newest_projects.length > 0) {
rows.push(
-
-
+
+
);
}
@@ -262,12 +251,9 @@ var Splash = injectIntl(React.createClass({
this.state.featuredCustom.custom_projects_by_following.length > 0) {
rows.push(
-
-
+
);
@@ -276,12 +262,9 @@ var Splash = injectIntl(React.createClass({
this.state.featuredCustom.custom_projects_loved_by_following.length > 0) {
rows.push(
-
-
+
);
@@ -291,31 +274,22 @@ var Splash = injectIntl(React.createClass({
this.state.featuredCustom.custom_projects_in_studios_following.length > 0) {
rows.push(
-
-
+
);
}
rows.push(
-
,
-
Settings: schools, museums, libraries, community centers",
"teacherlanding.generalUsageGradeLevels": "Grade Levels: elementary, middle, and high school (and some colleges too!)",
"teacherlanding.generalUsageSubjectAreas": "Subject Areas: language arts, science, social studies, math, computer science, foreign languages, and the arts",
- "teacherlanding.resourcesTitle": "Educator Resources",
"teacherlanding.scratchEdTitle": "A Community for Educators",
"teacherlanding.scratchEdDescription": "ScratchEd is an online community where Scratch educators share stories, exchange resources, ask questions, and find people. ScratchEd is developed and supported by the Harvard Graduate School of Education.",
"teacherlanding.meetupTitle": "In-Person Gatherings",
diff --git a/src/views/teachers/landing/landing.jsx b/src/views/teachers/landing/landing.jsx
index ce32a564c..f800cfedf 100644
--- a/src/views/teachers/landing/landing.jsx
+++ b/src/views/teachers/landing/landing.jsx
@@ -64,7 +64,7 @@ var Landing = injectIntl(React.createClass({