X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fcomponents%2Frounds%2FItem.js;h=0ef77c5d2c5ce6b9bec1c8798ddba6c184b43a77;hb=8645b77ea2dc402f0265e1c8022ba18302506ca1;hp=3197f6d9aa64da0a8df2c68a02b7f1a522deae7b;hpb=72d6c25d3b1a6d79843d5673ba78804dd442ae39;p=alttp.git diff --git a/resources/js/components/rounds/Item.js b/resources/js/components/rounds/Item.js index 3197f6d..0ef77c5 100644 --- a/resources/js/components/rounds/Item.js +++ b/resources/js/components/rounds/Item.js @@ -1,6 +1,6 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { withTranslation } from 'react-i18next'; +import { useTranslation } from 'react-i18next'; import EditButton from './EditButton'; import LockButton from './LockButton'; @@ -12,8 +12,7 @@ import ReportButton from '../results/ReportButton'; import { mayEditRound, mayReportResult, isRunner } from '../../helpers/permissions'; import { isComplete } from '../../helpers/Round'; import { hasFinishedRound } from '../../helpers/User'; -import { withUser } from '../../helpers/UserContext'; -import i18n from '../../i18n'; +import { useUser } from '../../hooks/user'; const getClassName = (round, tournament, user) => { const classNames = ['round']; @@ -38,51 +37,57 @@ const getClassName = (round, tournament, user) => { const Item = ({ round, tournament, - user, -}) => -
- {round.number ? `#${round.number} ` : '#?'} - {i18n.t('rounds.date', { date: new Date(round.created_at) })} -
-
- {round.code && round.code.length ?
- <>
-
- >
- : null}
-
-
+ {tournament.show_numbers && round.number ? `#${round.number} ` : ''}
+ {t('rounds.date', { date: new Date(round.created_at) })}
+
+ {round.code && round.code.length ?
+ <>
+
+ {t('rounds.numberOfResults', { count: round.results.length })}{round.title}
+ : null}
+
+ >
+ : null}
+
-