diff --git a/pages/program/lightning-talk.tsx b/pages/program/lightning-talk.tsx index d4a9f94..0ca70dc 100644 --- a/pages/program/lightning-talk.tsx +++ b/pages/program/lightning-talk.tsx @@ -61,7 +61,7 @@ const LightningTalkList = (props) => { 9 ? t('program:lightningTalk.stanby', {number: index - 9}) : `${index + 1}.`) + name} /> + name={(index > 12 ? t('program:lightningTalk.stanby', {number: index - 12}) : `${index + 1}.`) + name} /> ) }) } @@ -70,7 +70,7 @@ const LightningTalkList = (props) => {

{ t('program:lightningTalk.header4-2') }

@@ -81,7 +81,7 @@ const LightningTalkList = (props) => { 9 ? t('program:lightningTalk.stanby', {number: index - 9}) : `${index + 1}. `) + name} /> + name={(index > 12 ? t('program:lightningTalk.stanby', {number: index - 12}) : `${index + 1}. `) + name} /> ) }) } @@ -90,7 +90,7 @@ const LightningTalkList = (props) => { ) @@ -128,6 +128,15 @@ export class LightningTalk extends React.Component {

{ t('program:lightningTalk.header4') }

+ + { t('program:lightningTalk.desc6') } + + { ({ loading, error, data }) => { diff --git a/pages/timetable/talks.tsx b/pages/timetable/talks.tsx index 16dad2b..7968c18 100644 --- a/pages/timetable/talks.tsx +++ b/pages/timetable/talks.tsx @@ -16,6 +16,7 @@ import { PresentationNode } from 'lib/apollo_graphql/queries/getPresentations' import { paths, timetableMenu } from 'routes/paths' import { PageDefaultPropsType } from 'types/PageDefaultPropsType' import { withNamespaces } from '../../i18n' +import { formatDateInTimetable } from 'utils/formatDate' @(withRouter as any) @inject('stores') @@ -50,7 +51,8 @@ class Talks extends React.Component { const { selectedDate, setSelectedDate, conferenceTalks } = stores.cfpStore const { conferenceStartAt, conferenceFinishAt } = stores.scheduleStore.schedule const _title = t('timetable:talks.title') - setSelectedDate(selectedDate || conferenceStartAt) + const today = formatDateInTimetable(new Date().toString()) + setSelectedDate(selectedDate || today) return ( (date: DateDTO) => { } export const formatDateInWords = formatDate('MMMM Do') +export const formatDateInTimetable = formatDate('YYYY-MM-DD') export const formatDateInWordsWithTime = formatDate('MMMM Do HH:mm') export const formatDateInWordsWithWeekdayAndTime = formatDate('MMMM Do [(]dd[)] HH:mm') export const formatDateOnlyTime = formatDate('HH:mm')