watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-16 10:35:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Convert text for internationalization.

Browse source
This commit is contained in:
Mike Cao 2020-09-05 17:27:01 -07:00
parent 6833a5bdb0
commit f0ac9b6522
36 changed files with 1091 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/metrics/ActiveUsers.js
View file

@ -3,6 +3,7 @@ import { useSpring, animated } from 'react-spring';
import classNames from 'classnames';
import useFetch from 'hooks/useFetch';
import styles from './ActiveUsers.module.css';
import { FormattedMessage } from 'react-intl';
export default function ActiveUsers({ websiteId, className }) {
const { data } = useFetch(`/api/website/${websiteId}/active`, {}, { interval: 60000 });
@ -26,7 +27,13 @@ export default function ActiveUsers({ websiteId, className }) {
<animated.div className={styles.value}>
{props.x.interpolate(x => x.toFixed(0))}
</animated.div>
<div>{`current visitor${count !== 1 ? 's' : ''}`}</div>
<div>
<FormattedMessage
id="active-users.message"
defaultMessage="current {count, plural, one {visitor} other {visitors}}"
values={{ count }}
/>
</div>
</div>
</div>
);

5
components/metrics/BrowsersTable.js
View file

@ -1,13 +1,14 @@
import React from 'react';
import { FormattedMessage } from 'react-intl';
import MetricsTable from './MetricsTable';
import { browserFilter } from 'lib/filters';
export default function BrowsersTable({ websiteId, limit, onExpand }) {
return (
<MetricsTable
title="Browsers"
title={<FormattedMessage id="metrics.browsers" defaultMessage="Browsers" />}
type="browser"
metric="Visitors"
metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
websiteId={websiteId}
limit={limit}
dataFilter={browserFilter}

5
components/metrics/CountriesTable.js
View file

@ -1,13 +1,14 @@
import React from 'react';
import MetricsTable from './MetricsTable';
import { countryFilter, percentFilter } from 'lib/filters';
import { FormattedMessage } from 'react-intl';
export default function CountriesTable({ websiteId, limit, onDataLoad = () => {}, onExpand }) {
return (
<MetricsTable
title="Countries"
title={<FormattedMessage id="metrics.countries" defaultMessage="Countries" />}
type="country"
metric="Visitors"
metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
websiteId={websiteId}
limit={limit}
dataFilter={countryFilter}

5
components/metrics/DevicesTable.js
View file

@ -1,13 +1,14 @@
import React from 'react';
import MetricsTable from './MetricsTable';
import { deviceFilter } from 'lib/filters';
import { FormattedMessage } from 'react-intl';
export default function DevicesTable({ websiteId, limit, onExpand }) {
return (
<MetricsTable
title="Devices"
title={<FormattedMessage id="metrics.devices" defaultMessage="Devices" />}
type="device"
metric="Visitors"
metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
websiteId={websiteId}
limit={limit}
dataFilter={deviceFilter}

5
components/metrics/EventsTable.js
View file

@ -1,13 +1,14 @@
import React from 'react';
import { FormattedMessage } from 'react-intl';
import MetricsTable from './MetricsTable';
import styles from './EventsTable.module.css';
export default function EventsTable({ websiteId, limit, onExpand, onDataLoad }) {
return (
<MetricsTable
title="Events"
title={<FormattedMessage id="metrics.events" defaultMessage="Events" />}
type="event"
metric="Actions"
metric={<FormattedMessage id="metrics.actions" defaultMessage="Actions" />}
websiteId={websiteId}
limit={limit}
renderLabel={({ x }) => <Label value={x} />}

26
components/metrics/MetricsBar.js
View file

@ -1,11 +1,12 @@
import React, { useState } from 'react';
import { FormattedMessage } from 'react-intl';
import classNames from 'classnames';
import MetricCard from './MetricCard';
import Loading from 'components/common/Loading';
import useFetch from 'hooks/useFetch';
import { useDateRange } from 'hooks/useDateRange';
import { formatShortTime, formatNumber, formatLongNumber } from 'lib/format';
import MetricCard from './MetricCard';
import styles from './MetricsBar.module.css';
import { useDateRange } from '../../hooks/useDateRange';
export default function MetricsBar({ websiteId, className }) {
const dateRange = useDateRange(websiteId);
@ -36,15 +37,28 @@ export default function MetricsBar({ websiteId, className }) {
<Loading />
) : (
<>
<MetricCard label="Views" value={pageviews} format={formatFunc} />
<MetricCard label="Visitors" value={uniques} format={formatFunc} />
<MetricCard
label="Bounce rate"
label={<FormattedMessage id="metrics.views" defaultMessage="Views" />}
value={pageviews}
format={formatFunc}
/>
<MetricCard
label={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
value={uniques}
format={formatFunc}
/>
<MetricCard
label={<FormattedMessage id="metrics.bounce-rate" defaultMessage="Bounce rate" />}
value={pageviews ? (bounces / pageviews) * 100 : 0}
format={n => Number(n).toFixed(0) + '%'}
/>
<MetricCard
label="Average visit time"
label={
<FormattedMessage
id="metrics.average-visit-time"
defaultMessage="Average visit time"
/>
}
value={totaltime && pageviews ? totaltime / (pageviews - bounces) : 0}
format={n => formatShortTime(n, ['m', 's'], ' ')}
/>

5
components/metrics/MetricsTable.js
View file

@ -10,6 +10,7 @@ import { percentFilter } from 'lib/filters';
import { formatNumber, formatLongNumber } from 'lib/format';
import { useDateRange } from 'hooks/useDateRange';
import styles from './MetricsTable.module.css';
import { FormattedMessage } from 'react-intl';
export default function MetricsTable({
websiteId,
@ -97,7 +98,9 @@ export default function MetricsTable({
<div className={styles.footer}>
{limit && data.length > limit && (
<Button icon={<Arrow />} size="xsmall" onClick={() => onExpand(type)}>
<div>More</div>
<div>
<FormattedMessage id="button.more" defaultMessage="More" />
</div>
</Button>
)}
</div>

5
components/metrics/OSTable.js
View file

@ -1,13 +1,14 @@
import React from 'react';
import MetricsTable from './MetricsTable';
import { osFilter } from 'lib/filters';
import { FormattedMessage } from 'react-intl';
export default function OSTable({ websiteId, limit, onExpand }) {
return (
<MetricsTable
title="Operating System"
title={<FormattedMessage id="metrics.operating-system" defaultMessage="Operating System" />}
type="os"
metric="Visitors"
metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
websiteId={websiteId}
limit={limit}
dataFilter={osFilter}

37
components/metrics/PagesTable.js
View file

@ -1,34 +1,39 @@
import React, { useState } from 'react';
import MetricsTable from './MetricsTable';
import { FormattedMessage } from 'react-intl';
import ButtonGroup from 'components/common/ButtonGroup';
import { urlFilter } from 'lib/filters';
import ButtonGroup from '../common/ButtonGroup';
import { FILTER_COMBINED, FILTER_RAW } from 'lib/constants';
import MetricsTable from './MetricsTable';
export default function PagesTable({ websiteId, websiteDomain, limit, onExpand }) {
const [filter, setFilter] = useState('Combined');
const [filter, setFilter] = useState(FILTER_COMBINED);
const buttons = [
{
label: <FormattedMessage id="metrics.filter.combined" defaultMessage="Combined" />,
value: FILTER_COMBINED,
},
{ label: <FormattedMessage id="metrics.filter.raw" defaultMessage="Raw" />, value: FILTER_RAW },
];
return (
<MetricsTable
title="Pages"
title={<FormattedMessage id="metrics.pages" defaultMessage="Pages" />}
type="url"
metric="Views"
headerComponent={limit ? null : <FilterButtons selected={filter} onClick={setFilter} />}
metric={<FormattedMessage id="metrics.views" defaultMessage="Views" />}
headerComponent={
limit ? null : <FilterButtons buttons={buttons} selected={filter} onClick={setFilter} />
}
websiteId={websiteId}
limit={limit}
dataFilter={urlFilter}
filterOptions={{ domain: websiteDomain, raw: filter === 'Raw' }}
filterOptions={{ domain: websiteDomain, raw: filter === FILTER_RAW }}
renderLabel={({ x }) => decodeURI(x)}
onExpand={onExpand}
/>
);
}
const FilterButtons = ({ selected, onClick }) => {
return (
<ButtonGroup
size="xsmall"
items={['Combined', 'Raw']}
selectedItem={selected}
onClick={onClick}
/>
);
const FilterButtons = ({ buttons, selected, onClick }) => {
return <ButtonGroup size="xsmall" items={buttons} selectedItem={selected} onClick={onClick} />;
};

13
components/metrics/PageviewsChart.js
View file

@ -1,8 +1,11 @@
import React from 'react';
import { useIntl } from 'react-intl';
import CheckVisible from 'components/helpers/CheckVisible';
import BarChart from './BarChart';
export default function PageviewsChart({ websiteId, data, unit, records, className }) {
const intl = useIntl();
const handleUpdate = chart => {
const {
data: { datasets },
@ -26,7 +29,10 @@ export default function PageviewsChart({ websiteId, data, unit, records, classNa
chartId={websiteId}
datasets={[
{
label: 'unique visitors',
label: intl.formatMessage({
id: 'metrics.unique-visitors',
defaultMessage: 'Unique visitors',
}),
data: data.uniques,
lineTension: 0,
backgroundColor: 'rgb(38, 128, 235, 0.4)',
@ -34,7 +40,10 @@ export default function PageviewsChart({ websiteId, data, unit, records, classNa
borderWidth: 1,
},
{
label: 'page views',
label: intl.formatMessage({
id: 'metrics.page-views',
defaultMessage: 'Page views',
}),
data: data.pageviews,
lineTension: 0,
backgroundColor: 'rgb(38, 128, 235, 0.2)',

18
components/metrics/QuickButtons.js
View file

@ -3,18 +3,18 @@ import ButtonGroup from 'components/common/ButtonGroup';
import { getDateRange } from 'lib/date';
import styles from './QuickButtons.module.css';
const options = {
'24h': '24hour',
'7d': '7day',
'30d': '30day',
};
const options = [
{ label: '24h', value: '24hour' },
{ label: '7d', value: '7day' },
{ label: '30d', value: '30day' },
];
export default function QuickButtons({ value, onChange }) {
const selectedItem = Object.keys(options).find(key => options[key] === value);
const selectedItem = options.find(item => item.value === value)?.value;
function handleClick(selected) {
if (options[selected] !== value) {
onChange(getDateRange(options[selected]));
if (selected !== value) {
onChange(getDateRange(selected));
}
}
@ -22,7 +22,7 @@ export default function QuickButtons({ value, onChange }) {
<ButtonGroup
size="xsmall"
className={styles.buttons}
items={Object.keys(options)}
items={options}
selectedItem={selectedItem}
onClick={handleClick}
/>

39
components/metrics/ReferrersTable.js
View file

@ -1,10 +1,24 @@
import React, { useState } from 'react';
import { FormattedMessage } from 'react-intl';
import MetricsTable from './MetricsTable';
import { refFilter } from 'lib/filters';
import ButtonGroup from 'components/common/ButtonGroup';
import { FILTER_DOMAIN_ONLY, FILTER_COMBINED, FILTER_RAW } from 'lib/constants';
export default function ReferrersTable({ websiteId, websiteDomain, limit, onExpand = () => {} }) {
const [filter, setFilter] = useState('Combined');
const [filter, setFilter] = useState(FILTER_COMBINED);
const buttons = [
{
label: <FormattedMessage id="metrics.filter.domain-only" defaultMessage="Domain only" />,
value: FILTER_DOMAIN_ONLY,
},
{
label: <FormattedMessage id="metrics.filter.combined" defaultMessage="Combined" />,
value: FILTER_COMBINED,
},
{ label: <FormattedMessage id="metrics.filter.raw" defaultMessage="Raw" />, value: FILTER_RAW },
];
const renderLink = ({ x: url }) => {
return url.startsWith('http') ? (
@ -18,18 +32,20 @@ export default function ReferrersTable({ websiteId, websiteDomain, limit, onExpa
return (
<MetricsTable
title="Referrers"
title={<FormattedMessage id="metrics.referrers" defaultMessage="Referrers" />}
type="referrer"
metric="Views"
headerComponent={limit ? null : <FilterButtons selected={filter} onClick={setFilter} />}
metric={<FormattedMessage id="metrics.views" defaultMessage="Views" />}
headerComponent={
limit ? null : <FilterButtons buttons={buttons} selected={filter} onClick={setFilter} />
}
websiteId={websiteId}
websiteDomain={websiteDomain}
limit={limit}
dataFilter={refFilter}
filterOptions={{
domain: websiteDomain,
domainOnly: filter === 'Domain only',
raw: filter === 'Raw',
domainOnly: filter === FILTER_DOMAIN_ONLY,
raw: filter === FILTER_RAW,
}}
onExpand={onExpand}
renderLabel={renderLink}
@ -37,13 +53,6 @@ export default function ReferrersTable({ websiteId, websiteDomain, limit, onExpa
);
}
const FilterButtons = ({ selected, onClick }) => {
return (
<ButtonGroup
size="xsmall"
items={['Domain only', 'Combined', 'Raw']}
selectedItem={selected}
onClick={onClick}
/>
);
const FilterButtons = ({ buttons, selected, onClick }) => {
return <ButtonGroup size="xsmall" items={buttons} selectedItem={selected} onClick={onClick} />;
};

5
components/metrics/WebsiteHeader.js
View file

@ -1,4 +1,5 @@
import React from 'react';
import { FormattedMessage } from 'react-intl';
import { useRouter } from 'next/router';
import PageHeader from 'components/layout/PageHeader';
import Button from 'components/common/Button';
@ -27,7 +28,9 @@ export default function WebsiteHeader({ websiteId, title, showLink = false }) {
}
size="small"
>
<div>View details</div>
<div>
<FormattedMessage id="button.view-details" defaultMessage="View details" />
</div>
</Button>
)}
</ButtonLayout>