m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Brian Cao 2023-04-13 20:33:24 -07:00
commit 081a126c01
6 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/messages.js
View File

@ -10,6 +10,7 @@ export const labels = defineMessages({
leave: { id: 'label.leave', defaultMessage: 'Leave' }, leave: { id: 'label.leave', defaultMessage: 'Leave' },
users: { id: 'label.users', defaultMessage: 'Users' }, users: { id: 'label.users', defaultMessage: 'Users' },
createUser: { id: 'label.create-user', defaultMessage: 'Create user' }, createUser: { id: 'label.create-user', defaultMessage: 'Create user' },
deleteUser: { id: 'label.delete-users', defaultMessage: 'Delete user' },
username: { id: 'label.username', defaultMessage: 'Username' }, username: { id: 'label.username', defaultMessage: 'Username' },
password: { id: 'label.password', defaultMessage: 'Password' }, password: { id: 'label.password', defaultMessage: 'Password' },
role: { id: 'label.role', defaultMessage: 'Role' }, role: { id: 'label.role', defaultMessage: 'Role' },

2
components/pages/settings/teams/TeamDeleteForm.js
View File

@ -19,7 +19,7 @@ export default function TeamDeleteForm({ teamId, teamName, onSave, onClose }) {
return ( return (
<Form onSubmit={handleSubmit} error={error}> <Form onSubmit={handleSubmit} error={error}>
<p> <p>
<FormattedMessage {...messages.confirmDelete} values={{ name: <b>{teamName}</b> }} /> <FormattedMessage {...messages.confirmDelete} values={{ target: <b>{teamName}</b> }} />
</p> </p>
<FormButtons flex> <FormButtons flex>
<SubmitButton variant="danger" disabled={isLoading}> <SubmitButton variant="danger" disabled={isLoading}>

2
components/pages/settings/users/UsersTable.js
View File

@ -52,7 +52,7 @@ export default function UsersTable({ data = [], onDelete }) {
</Icon> </Icon>
<Text>{formatMessage(labels.delete)}</Text> <Text>{formatMessage(labels.delete)}</Text>
</Button> </Button>
<Modal> <Modal title={formatMessage(labels.deleteUser)}>
{close => ( {close => (
<UserDeleteForm <UserDeleteForm
userId={row.id} userId={row.id}

9
components/pages/settings/websites/WebsiteDeleteForm.js
View File

@ -13,7 +13,7 @@ import useMessages from 'hooks/useMessages';
const CONFIRM_VALUE = 'DELETE'; const CONFIRM_VALUE = 'DELETE';
export default function WebsiteDeleteForm({ websiteId, onSave, onClose }) { export default function WebsiteDeleteForm({ websiteId, onSave, onClose }) {
const { formatMessage, labels, messages } = useMessages(); const { formatMessage, labels, messages, FormattedMessage } = useMessages();
const { del, useMutation } = useApi(); const { del, useMutation } = useApi();
const { mutate, error } = useMutation(data => del(`/websites/${websiteId}`, data)); const { mutate, error } = useMutation(data => del(`/websites/${websiteId}`, data));
@ -28,7 +28,12 @@ export default function WebsiteDeleteForm({ websiteId, onSave, onClose }) {
return ( return (
<Form onSubmit={handleSubmit} error={error}> <Form onSubmit={handleSubmit} error={error}>
<p>{formatMessage(messages.deleteWebsite, { confirmation: CONFIRM_VALUE })}</p> <p>
<FormattedMessage
{...messages.deleteWebsite}
values={{ confirmation: <b>{CONFIRM_VALUE}</b> }}
/>
</p>
<FormRow label={formatMessage(labels.confirm)}> <FormRow label={formatMessage(labels.confirm)}>
<FormInput name="confirmation" rules={{ validate: value => value === CONFIRM_VALUE }}> <FormInput name="confirmation" rules={{ validate: value => value === CONFIRM_VALUE }}>
<TextField autoComplete="off" /> <TextField autoComplete="off" />

2
lang/en-US.json
View File

@ -113,7 +113,7 @@
"message.confirm-delete": "Are you sure you want to delete {target}?", "message.confirm-delete": "Are you sure you want to delete {target}?",
"message.confirm-leave": "Are you sure you want to leave {target}?", "message.confirm-leave": "Are you sure you want to leave {target}?",
"message.confirm-reset": "Are you sure you want to reset {target}'s statistics?", "message.confirm-reset": "Are you sure you want to reset {target}'s statistics?",
"message.delete-website": "Delete website", "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
"message.delete-website-warning": "All associated data will be deleted as well.", "message.delete-website-warning": "All associated data will be deleted as well.",
"message.error": "Something went wrong.", "message.error": "Something went wrong.",
"message.event-log": "{event} on {url}", "message.event-log": "{event} on {url}",

10
public/intl/messages/en-US.json
View File

@ -758,7 +758,15 @@
"message.delete-website": [ "message.delete-website": [
{ {
"type": 0, "type": 0,
"value": "Delete website" "value": "To delete this website, type "
},
{
"type": 1,
"value": "confirmation"
},
{
"type": 0,
"value": " in the box below to confirm."
} }
], ],
"message.delete-website-warning": [ "message.delete-website-warning": [