Skip to content

GitLab

S
scratch-www
Commit 87146c31 authored by Matthew Taylor's avatar Matthew Taylor
Browse files
Options

Merge branch 'hotfix/dec-1' of https://github.com/LLK/scratch-www into develop 

* 'hotfix/dec-1' of https://github.com/LLK/scratch-www:
  update transifex config to reflect new conference page
  fix lint
  update translations to just use `FormattedMessage`
  Change back routeAlias for conference pages
  Add Learning Resource designer (#1676)
  Fixes #1633 - Scratch Conference 2018 Website Phase 1 (#1673)
  Fix #1649: Edit Scratch Conf Website - Correct Info for Costa Rica Conf (#1650) (#1663)

# Conflicts:
#	src/routes.json
#	src/views/conference/2018/index/index.jsx
#	src/views/conference/2018/index/l10n.json
parents 4ae8edd1 8f7bb287
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 20 deletions
.tx/config
View file @ 87146c31
......@@ -92,8 +92,8 @@ source_file = src/views/microworldshomepage/l10n.json
source_lang = en
type = KEYVALUEJSON
[scratch-website.conference-index-l10njson]
file_filter = localizations/conference-index/<lang>.json
[scratch-website.conference-index-2017-l10njson]
file_filter = localizations/conference-index-2017/<lang>.json
source_file = src/views/conference/2017/index/l10n.json
source_lang = en
type = KEYVALUEJSON
......@@ -127,3 +127,9 @@ file_filter = localizations/messages/<lang>.json
source_file = src/views/messages/l10n.json
source_lang = en
type = KEYVALUEJSON
[scratch-website.conference-index-l10njson]
file_filter = localizations/conference-index/<lang>.json
source_file = src/views/conference/2018/index/l10n.json
source_lang = en
type = KEYVALUEJSON
src/routes.json
View file @ 87146c31
......@@ -44,7 +44,7 @@
{
"name": "conference-index",
"pattern": "^/conference/?$",
"routeAlias": "/conference(?!/201[4-7])",
"routeAlias": "/conference(?!/201[4-5])",
"view": "conference/2018/index/index",
"title": "Scratch Conference",
"viewportWidth": "device-width"
......@@ -52,7 +52,7 @@
{
"name": "conference-index-2017",
"pattern": "^/conference/2017/?$",
"routeAlias": "/conference(?!/201[4-6])",
"routeAlias": "/conference(?!/201[4-5])",
"view": "conference/2017/index/index",
"title": "Scratch Conference",
"viewportWidth": "device-width"
......
src/views/conference/2018/index/index.jsx
View file @ 87146c31
var FormattedDate = require('react-intl').FormattedDate;
var FormattedMessage = require('react-intl').FormattedMessage;
var FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage;
var React = require('react');
var render = require('../../../../lib/render.jsx');
......@@ -21,7 +20,9 @@ var ConferenceSplash = React.createClass({
<div className='title-banner-image mod-2018'></div>
<h1 className='title-banner-h1 mod-2018'>
<center>
<FormattedHTMLMessage id='conference-2018.title' />
<FormattedMessage id='conference-2018.title' />
<br />
<FormattedMessage id='conference-2018.subtitle' />
</center>
</h1>
<h3 className='title-banner-h3 mod-2018'>
......@@ -31,7 +32,10 @@ var ConferenceSplash = React.createClass({
<div className='inner'>
<section className='conf2018-panel mod-desc'>
<p className='conf2018-panel-desc'>
<FormattedHTMLMessage id='conference-2018.desc' />
<FormattedMessage id='conference-2018.desc1' />
<br />
<br />
<FormattedMessage id='conference-2018.desc2' />
</p>
<table className='conf2018-panel-details'>
<tbody>
......@@ -77,20 +81,32 @@ var ConferenceSplash = React.createClass({
</section>
<section className='conf2018-panel'>
<p className='conf2018-panel-desc'>
<FormattedHTMLMessage id='conference-2018.sessionDesc' />
<FormattedMessage id='conference-2018.sessionDesc' />
</p>
<p className='conf2018-panel-session'>
<p className='conf2018-panel-session'>
<FormattedHTMLMessage id='conference-2018.sessionItem1' />
<b>
<FormattedMessage id='conference-2018.sessionItem1Title' />
</b>{' '}
<FormattedMessage id='conference-2018.sessionItem1Desc' />
</p>
<p className='conf2018-panel-session'>
<FormattedHTMLMessage id='conference-2018.sessionItem2' />
<b>
<FormattedMessage id='conference-2018.sessionItem2Title' />
</b>{' '}
<FormattedMessage id='conference-2018.sessionItem2Desc' />
</p>
<p className='conf2018-panel-session'>
<FormattedHTMLMessage id='conference-2018.sessionItem3' />
<b>
<FormattedMessage id='conference-2018.sessionItem3Title' />
</b>{' '}
<FormattedMessage id='conference-2018.sessionItem3Desc' />
</p>
<p className='conf2018-panel-session'>
<FormattedHTMLMessage id='conference-2018.sessionItem4' />
<b>
<FormattedMessage id='conference-2018.sessionItem4Title' />
</b>{' '}
<FormattedMessage id='conference-2018.sessionItem4Desc' />
</p>
</p>
<a className='button mod-2018-panel' href='https://docs.google.com/forms/d/e/1FAIpQLSd7SkuQ-dfW-P3aArSQokK9GkKAUKufTVBHod_ElNIiFE9iBQ/viewform?usp=sf_link'>
......@@ -111,7 +127,14 @@ var ConferenceSplash = React.createClass({
</section>
<section className='conf2018-panel mod-questions'>
<p className='conf2018-panel-desc'>
<FormattedHTMLMessage id='conference-2018.questions' />
<FormattedMessage
id='conference-2018.questions'
values={{
emailLink: <a href='mailto:conference@scratch.mit.edu'>
conference@scratch.mit.edu
</a>
}}
/>
</p>
</section>
</div>
......
src/views/conference/2018/index/l10n.json
View file @ 87146c31
{
"conference-2018.title": "Scratch Conference 2018 <br/> The Next Generation",
"conference-2018.title": "Scratch Conference 2018",
"conference-2018.subtitle": "The Next Generation",
"conference-2018.dateDesc": "July 26-28, 2018 | Cambridge, MA, USA",
"conference-2018.dateDescMore": " (with opening reception the evening of July 25)",
"conference-2018.locationDetails": "MIT Media Lab, Cambridge, MA",
......@@ -8,13 +9,18 @@
"conference-2018.date": "When:",
"conference-2018.location": "Where:",
"conference-2018.desc": "Join us for the Scratch@MIT conference, a playful gathering of educators, researchers, developers, and other members of the worldwide Scratch community.<br /> <br />We're planning a very participatory conference, with an entire day of hands-on workshops and lots of opportunities for peer-to-peer discussion and collaboration.",
"conference-2018.desc1": "Join us for the Scratch@MIT conference, a playful gathering of educators, researchers, developers, and other members of the worldwide Scratch community.",
"conference-2018.desc2": "We're planning a very participatory conference, with an entire day of hands-on workshops and lots of opportunities for peer-to-peer discussion and collaboration.",
"conference-2018.sessionDesc": "Interested in offering a session? We invite four types of proposals:",
"conference-2018.sessionItem1": "<b>Poster/demonstration (90 minutes)</b>. Show off your project in an exhibition setting, alongside other presenters. You will be provided with display space for a poster and table space for a computer or handouts.",
"conference-2018.sessionItem2": "<b>Hands-on workshop (90 minutes)</b>. Engage participants in hands-on activities, highlighting new ways of creating and collaborating with Scratch.",
"conference-2018.sessionItem3": "<b>Interactive panel (60 minutes)</b>. Discuss a Scratch-related topic in a panel with three or more people. Your proposal should describe how you will engage the audience during the session.",
"conference-2018.sessionItem4": "<b>Ignite talk (5 minutes)</b>. Share what you've been doing in a short, lively presentation.",
"conference-2018.sessionItem1Title": "Poster/demonstration (90 minutes).",
"conference-2018.sessionItem1Desc": "Show off your project in an exhibition setting, alongside other presenters. You will be provided with display space for a poster and table space for a computer or handouts.",
"conference-2018.sessionItem2Title": "Hands-on workshop (90 minutes).",
"conference-2018.sessionItem2Desc": "Engage participants in hands-on activities, highlighting new ways of creating and collaborating with Scratch.",
"conference-2018.sessionItem3Title": "Interactive panel (60 minutes).",
"conference-2018.sessionItem3Desc": "Discuss a Scratch-related topic in a panel with three or more people. Your proposal should describe how you will engage the audience during the session.",
"conference-2018.sessionItem4Title": "Ignite talk (5 minutes).",
"conference-2018.sessionItem4Desc": "Share what you've been doing in a short, lively presentation.",
"conference-2018.proposal": " Submit Your Proposal",
"conference-2018.proposalDeadline": "Deadline for proposals: February 5",
......@@ -24,5 +30,5 @@
"conference-2018.registrationEarly": "Early Bird Registration (March 1-May 1): $200",
"conference-2018.registrationStandard": "Standard Registration (after May 1): $300",
"conference-2018.questions": "Questions? Contact the Scratch Team at <a href='mailto:conference@scratch.mit.edu'>conference@scratch.mit.edu</a>"
"conference-2018.questions": "Questions? Contact the Scratch Team at {emailLink}"
}
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