scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 07:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1235 from TheGrits/patch-3

Browse source 
Fix gh-1234: Update China Conference
This commit is contained in:
Matthew Taylor 2017-03-06 11:10:03 -05:00 committed by GitHub
commit f76707381a
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/views/conference/2017/index/index.jsx
View file

@ -458,7 +458,19 @@ var ConferenceSplash = React.createClass({
</td>
<td><FormattedMessage id='conference-2017.date' /></td>
<td>
{'Middle of May, 2017'}
<FormattedDate
value={new Date(2017, 5, 20)}
year='numeric'
month='long'
day='2-digit'
/>
{' - '}
<FormattedDate
value={new Date(2017, 5, 21)}
year='numeric'
month='long'
day='2-digit'
/>
</td>
</tr>
<tr className='conf2017-panel-row'>
@ -496,8 +508,8 @@ var ConferenceSplash = React.createClass({
</tr>
</tbody>
</table>
<a className='button mod-2017-panel' href='mailto:jovi.tong@uniamber.com'>
<FormattedMessage id='conference-2017.contact' />
<a className='button mod-2017-panel' href='http://scratchconference2017.sxl.cn/'>
<FormattedMessage id='conference-2017.website' />
</a>
</section>
</div>