watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-11 08:07:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Get localized error messages.

Browse source
This commit is contained in:
Mike Cao 2025-09-14 23:43:22 -07:00
parent baba06c692
commit fc01ee9f56
32 changed files with 90 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
View file

@ -13,7 +13,7 @@ export function WebsiteMetricsBar({
compareMode?: boolean;
}) {
const { dateRange } = useDateRange(websiteId);
const { formatMessage, labels } = useMessages();
const { formatMessage, labels, getErrorMessage } = useMessages();
const { data, isLoading, isFetching, error } = useWebsiteStatsQuery(websiteId);
const isAllTime = dateRange.value === 'all';
@ -65,7 +65,7 @@ export function WebsiteMetricsBar({
data={metrics}
isLoading={isLoading}
isFetching={isFetching}
error={error}
error={getErrorMessage(error)}
minHeight="136px"
>
<MetricsBar>

8
src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx
View file

@ -31,7 +31,7 @@ export function CohortEditForm({
onClose?: () => void;
}) {
const { data } = useWebsiteCohortQuery(websiteId, cohortId);
const { formatMessage, labels, messages } = useMessages();
const { formatMessage, labels, messages, getErrorMessage } = useMessages();
const { mutate, error, isPending, touch, toast } = useUpdateQuery(
`/websites/${websiteId}/segments${cohortId ? `/${cohortId}` : ''}`,
@ -60,7 +60,11 @@ export function CohortEditForm({
};
return (
<Form error={error} onSubmit={handleSubmit} defaultValues={data || defaultValues}>
<Form
error={getErrorMessage(error)}
onSubmit={handleSubmit}
defaultValues={data || defaultValues}
>
{({ watch }) => {
const type = watch('parameters.action.type');

8
src/app/(main)/websites/[websiteId]/segments/SegmentEditForm.tsx
View file

@ -28,7 +28,7 @@ export function SegmentEditForm({
onClose?: () => void;
}) {
const { data } = useWebsiteSegmentQuery(websiteId, segmentId);
const { formatMessage, labels } = useMessages();
const { formatMessage, labels, getErrorMessage } = useMessages();
const { mutate, error, isPending, touch, toast } = useUpdateQuery(
`/websites/${websiteId}/segments${segmentId ? `/${segmentId}` : ''}`,
@ -53,7 +53,11 @@ export function SegmentEditForm({
}
return (
<Form error={error} onSubmit={handleSubmit} defaultValues={data || { parameters: { filters } }}>
<Form
onSubmit={handleSubmit}
defaultValues={data || { parameters: { filters } }}
error={getErrorMessage(error)}
>
<FormField
name="name"
label={formatMessage(labels.name)}

4
src/app/(main)/websites/[websiteId]/settings/WebsiteEditForm.tsx
View file

@ -4,7 +4,7 @@ import { DOMAIN_REGEX } from '@/lib/constants';
export function WebsiteEditForm({ websiteId, onSave }: { websiteId: string; onSave?: () => void }) {
const website = useWebsite();
const { formatMessage, labels, messages } = useMessages();
const { formatMessage, labels, messages, getErrorMessage } = useMessages();
const { mutate, error, touch, toast } = useUpdateQuery(`/websites/${websiteId}`);
const handleSubmit = async (data: any) => {
@ -18,7 +18,7 @@ export function WebsiteEditForm({ websiteId, onSave }: { websiteId: string; onSa
};
return (
<Form onSubmit={handleSubmit} error={error} values={website}>
<Form onSubmit={handleSubmit} error={getErrorMessage(error)} values={website}>
<FormField name="id" label={formatMessage(labels.websiteId)}>
<TextField data-test="text-field-websiteId" value={website?.id} isReadOnly allowCopy />
</FormField>

4
src/app/(main)/websites/[websiteId]/settings/WebsiteShareForm.tsx
View file

@ -23,7 +23,7 @@ export interface WebsiteShareFormProps {
}
export function WebsiteShareForm({ websiteId, shareId, onSave, onClose }: WebsiteShareFormProps) {
const { formatMessage, labels, messages } = useMessages();
const { formatMessage, labels, messages, getErrorMessage } = useMessages();
const [id, setId] = useState(shareId);
const { mutate, error, isPending, touch, toast } = useUpdateQuery(`/websites/${websiteId}`);
@ -52,7 +52,7 @@ export function WebsiteShareForm({ websiteId, shareId, onSave, onClose }: Websit
};
return (
<Form onSubmit={handleSave} error={error} values={{ url }}>
<Form onSubmit={handleSave} error={getErrorMessage(error)} values={{ url }}>
<Column gap>
<Switch isSelected={!!id} onChange={handleSwitch}>
{formatMessage(labels.enableShareUrl)}

4
src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsx
View file

@ -31,7 +31,7 @@ export function WebsiteTransferForm({
const { user } = useLoginQuery();
const website = useWebsite();
const [teamId, setTeamId] = useState<string>(null);
const { formatMessage, labels, messages } = useMessages();
const { formatMessage, labels, messages, getErrorMessage } = useMessages();
const { mutate, error, isPending } = useUpdateQuery(`/websites/${websiteId}/transfer`);
const { data: teams, isLoading } = useUserTeamsQuery(user.id);
const isTeamWebsite = !!website?.teamId;
@ -68,7 +68,7 @@ export function WebsiteTransferForm({
}
return (
<Form onSubmit={handleSubmit} error={error} values={{ teamId }}>
<Form onSubmit={handleSubmit} error={getErrorMessage(error)} values={{ teamId }}>
<Text>
{formatMessage(
isTeamWebsite ? messages.transferTeamWebsiteToUser : messages.transferUserWebsiteToTeam,