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

Removed FormattedMessage usage.

Browse Source
This commit is contained in:
Mike Cao
2025-02-07 10:40:30 -08:00
parent 84193a4ec5
commit f242835fc2
13 changed files with 132 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/(main)/settings/teams/TeamLeaveForm.tsx
View File

@@ -14,7 +14,7 @@ export function TeamLeaveForm({
onSave: () => void;
onClose: () => void;
}) {
const { formatMessage, labels, messages, FormattedMessage } = useMessages();
const { formatMessage, labels, messages } = useMessages();
const { del, useMutation } = useApi();
const { mutate, error, isPending } = useMutation({
mutationFn: () => del(`/teams/${teamId}/users/${userId}`),
@@ -34,9 +34,7 @@ export function TeamLeaveForm({
return (
<ConfirmationForm
buttonLabel={formatMessage(labels.leave)}
message={
<FormattedMessage {...messages.confirmLeave} values={{ target: <b>{teamName}</b> }} />
}
message={formatMessage(messages.confirmLeave, { target: <b>{teamName}</b> })}
onConfirm={handleConfirm}
onClose={onClose}
isLoading={isPending}

6
src/app/(main)/settings/users/UserDeleteForm.tsx
View File

@@ -2,7 +2,7 @@ import { useApi, useMessages, useModified } from '@/components/hooks';
import ConfirmationForm from '@/components/common/ConfirmationForm';
export function UserDeleteForm({ userId, username, onSave, onClose }) {
const { FormattedMessage, messages, labels, formatMessage } = useMessages();
const { messages, labels, formatMessage } = useMessages();
const { del, useMutation } = useApi();
const { mutate, error, isPending } = useMutation({ mutationFn: () => del(`/users/${userId}`) });
const { touch } = useModified();
@@ -19,9 +19,7 @@ export function UserDeleteForm({ userId, username, onSave, onClose }) {
return (
<ConfirmationForm
message={
<FormattedMessage {...messages.confirmDelete} values={{ target: <b>{username}</b> }} />
}
message={formatMessage(messages.confirmDelete, { target: <b>{username}</b> })}
onConfirm={handleConfirm}
onClose={onClose}
buttonLabel={formatMessage(labels.delete)}