github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Mike Cao
2020-09-12 04:37:02 -07:00
parent 8e3286179a e426524992
commit 372f709f95
17 changed files with 641 additions and 1455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/WebsiteDetails.js
View File

@@ -60,7 +60,7 @@ export default function WebsiteDetails({ websiteId }) {
component: BrowsersTable,
},
{
label: <FormattedMessage id="metrics.operating-system" defaultMessage="Operating system" />,
label: <FormattedMessage id="metrics.operating-systems" defaultMessage="Operating system" />,
value: 'os',
component: OSTable,
},

2
components/metrics/OSTable.js
View File

@@ -6,7 +6,7 @@ import { FormattedMessage } from 'react-intl';
export default function OSTable({ websiteId, limit, onExpand }) {
return (
<MetricsTable
title={<FormattedMessage id="metrics.operating-system" defaultMessage="Operating system" />}
title={<FormattedMessage id="metrics.operating-systems" defaultMessage="Operating system" />}
type="os"
metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
websiteId={websiteId}

4
components/settings/ProfileSettings.js
View File

@@ -38,7 +38,9 @@ export default function ProfileSettings() {
<dd>{user.username}</dd>
</dl>
{changePassword && (
<Modal title="Change password">
<Modal
title={<FormattedMessage id="title.change-password" defaultMessage="Change password" />}
>
<ChangePasswordForm
values={{ user_id }}
onSave={handleSave}