Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Fix deleteWebsite message

Francis Cao887b3abb291e
diff --git a/components/pages/settings/websites/WebsiteDeleteForm.js b/components/pages/settings/websites/WebsiteDeleteForm.js
index 0661c5151..6bac43978 100644
--- a/components/pages/settings/websites/WebsiteDeleteForm.js
+++ b/components/pages/settings/websites/WebsiteDeleteForm.js
@@ -13,7 +13,7 @@ import useMessages from 'hooks/useMessages';
const CONFIRM_VALUE = 'DELETE';
export default function WebsiteDeleteForm({ websiteId, onSave, onClose }) {
- const { formatMessage, labels, messages } = useMessages();
+ const { formatMessage, labels, messages, FormattedMessage } = useMessages();
const { del, useMutation } = useApi();
const { mutate, error } = useMutation(data => del(`/websites/${websiteId}`, data));
@@ -28,7 +28,9 @@ export default function WebsiteDeleteForm({ websiteId, onSave, onClose }) {
return (
<Form onSubmit={handleSubmit} error={error}>
- <p>{formatMessage(messages.deleteWebsite, { confirmation: CONFIRM_VALUE })}</p>
+ <p>
+ <FormattedMessage {...messages.deleteWebsite} values={{ confirmation: CONFIRM_VALUE }} />
+ </p>
<FormRow label={formatMessage(labels.confirm)}>
<FormInput name="confirmation" rules={{ validate: value => value === CONFIRM_VALUE }}>
<TextField autoComplete="off" />
diff --git a/lang/en-US.json b/lang/en-US.json
index 19ec8537b..233253d79 100644
--- a/lang/en-US.json
+++ b/lang/en-US.json
@@ -113,7 +113,7 @@
"message.confirm-delete": "Are you sure you want to delete {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.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.error": "Something went wrong.",
"message.event-log": "{event} on {url}",
diff --git a/public/intl/messages/en-US.json b/public/intl/messages/en-US.json
index d8ce582af..5dc57b9ed 100644
--- a/public/intl/messages/en-US.json
+++ b/public/intl/messages/en-US.json
@@ -758,7 +758,15 @@
"message.delete-website": [
{
"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": [