diff --git a/components/messages.js b/components/messages.js index bfb173e8..de92ce8f 100644 --- a/components/messages.js +++ b/components/messages.js @@ -10,6 +10,7 @@ export const labels = defineMessages({ leave: { id: 'label.leave', defaultMessage: 'Leave' }, users: { id: 'label.users', defaultMessage: 'Users' }, createUser: { id: 'label.create-user', defaultMessage: 'Create user' }, + deleteUser: { id: 'label.delete-users', defaultMessage: 'Delete user' }, username: { id: 'label.username', defaultMessage: 'Username' }, password: { id: 'label.password', defaultMessage: 'Password' }, role: { id: 'label.role', defaultMessage: 'Role' }, diff --git a/components/pages/settings/teams/TeamDeleteForm.js b/components/pages/settings/teams/TeamDeleteForm.js index fe300aec..66752d0b 100644 --- a/components/pages/settings/teams/TeamDeleteForm.js +++ b/components/pages/settings/teams/TeamDeleteForm.js @@ -19,7 +19,7 @@ export default function TeamDeleteForm({ teamId, teamName, onSave, onClose }) { return (

- {teamName} }} /> + {teamName} }} />

diff --git a/components/pages/settings/users/UsersTable.js b/components/pages/settings/users/UsersTable.js index 5ea3806c..c60f11ff 100644 --- a/components/pages/settings/users/UsersTable.js +++ b/components/pages/settings/users/UsersTable.js @@ -52,7 +52,7 @@ export default function UsersTable({ data = [], onDelete }) { {formatMessage(labels.delete)} - + {close => ( del(`/websites/${websiteId}`, data)); @@ -28,7 +28,12 @@ export default function WebsiteDeleteForm({ websiteId, onSave, onClose }) { return ( -

{formatMessage(messages.deleteWebsite, { confirmation: CONFIRM_VALUE })}

+

+ {CONFIRM_VALUE} }} + /> +

value === CONFIRM_VALUE }}> diff --git a/lang/en-US.json b/lang/en-US.json index 19ec8537..233253d7 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 d8ce582a..5dc57b9e 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": [