Simplify i18n: remove old react-intl artifacts, rename formatMessage to t, replace FormattedMessage with t.rich().
- Rewrite messages.ts to plain string key maps (remove MessageDescriptor) - Rewrite useMessages hook to expose t from useTranslations() directly - Rename formatMessage → t across 193 consumer files - Replace custom FormattedMessage component with next-intl t.rich() - Update 52 language files to use rich text tags (<b>, <a>) - Remove all direct imports from @/components/messages in favor of useMessages() Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
1 parent
80cad6ea65
commit
50edb71687
247 files changed
+1660
-2194
No files matched your search
@@ -7,12 +7,12 @@ export interface ActionSelectProps {
|
||||
}
|
||||
|
||||
export function ActionSelect({ value = 'path', onChange }: ActionSelectProps) {
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
|
||||
return (
|
||||
<Select value={value} onChange={onChange}>
|
||||
<ListItem id="path">{formatMessage(labels.viewedPage)}</ListItem>
|
||||
<ListItem id="event">{formatMessage(labels.triggeredEvent)}</ListItem>
|
||||
<ListItem id="path">{t(labels.viewedPage)}</ListItem>
|
||||
<ListItem id="event">{t(labels.triggeredEvent)}</ListItem>
|
||||
</Select>
|
||||
);
|
||||
}
|
||||
@@ -5,7 +5,7 @@ import { useNavigation } from '@/components/hooks/useNavigation';
|
||||
|
||||
export function BounceFilter() {
|
||||
const { router, query, updateParams } = useNavigation();
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
const isSelected = query.excludeBounce === 'true';
|
||||
|
||||
const handleChange = (value: boolean) => {
|
||||
@@ -19,7 +19,7 @@ export function BounceFilter() {
|
||||
return (
|
||||
<Row alignItems="center" gap>
|
||||
<Checkbox isSelected={isSelected} onChange={handleChange}>
|
||||
{formatMessage(labels.excludeBounce)}
|
||||
{t(labels.excludeBounce)}
|
||||
</Checkbox>
|
||||
</Row>
|
||||
);
|
||||
|
||||
@@ -4,12 +4,12 @@ import { useMessages } from '@/components/hooks';
|
||||
import { CURRENCIES } from '@/lib/constants';
|
||||
|
||||
export function CurrencySelect({ value, onChange }) {
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
const [search, setSearch] = useState('');
|
||||
|
||||
return (
|
||||
<Select
|
||||
label={formatMessage(labels.currency)}
|
||||
label={t(labels.currency)}
|
||||
value={value}
|
||||
defaultValue={value}
|
||||
onChange={onChange}
|
||||
|
||||
@@ -22,56 +22,56 @@ export function DateFilter({
|
||||
placement = 'bottom',
|
||||
...props
|
||||
}: DateFilterProps) {
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
const [showPicker, setShowPicker] = useState(false);
|
||||
const { startDate, endDate } = parseDateRange(value) || {};
|
||||
const { isMobile } = useMobile();
|
||||
|
||||
const options = [
|
||||
{ label: formatMessage(labels.today), value: '0day' },
|
||||
{ label: t(labels.today), value: '0day' },
|
||||
{
|
||||
label: formatMessage(labels.lastHours, { x: '24' }),
|
||||
label: t(labels.lastHours, { x: '24' }),
|
||||
value: '24hour',
|
||||
},
|
||||
{
|
||||
label: formatMessage(labels.thisWeek),
|
||||
label: t(labels.thisWeek),
|
||||
value: '0week',
|
||||
divider: true,
|
||||
},
|
||||
{
|
||||
label: formatMessage(labels.lastDays, { x: '7' }),
|
||||
label: t(labels.lastDays, { x: '7' }),
|
||||
value: '7day',
|
||||
},
|
||||
{
|
||||
label: formatMessage(labels.thisMonth),
|
||||
label: t(labels.thisMonth),
|
||||
value: '0month',
|
||||
divider: true,
|
||||
},
|
||||
{
|
||||
label: formatMessage(labels.lastDays, { x: '30' }),
|
||||
label: t(labels.lastDays, { x: '30' }),
|
||||
value: '30day',
|
||||
},
|
||||
{
|
||||
label: formatMessage(labels.lastDays, { x: '90' }),
|
||||
label: t(labels.lastDays, { x: '90' }),
|
||||
value: '90day',
|
||||
},
|
||||
{ label: formatMessage(labels.thisYear), value: '0year' },
|
||||
{ label: t(labels.thisYear), value: '0year' },
|
||||
{
|
||||
label: formatMessage(labels.lastMonths, { x: '6' }),
|
||||
label: t(labels.lastMonths, { x: '6' }),
|
||||
value: '6month',
|
||||
divider: true,
|
||||
},
|
||||
{
|
||||
label: formatMessage(labels.lastMonths, { x: '12' }),
|
||||
label: t(labels.lastMonths, { x: '12' }),
|
||||
value: '12month',
|
||||
},
|
||||
showAllTime && {
|
||||
label: formatMessage(labels.allTime),
|
||||
label: t(labels.allTime),
|
||||
value: 'all',
|
||||
divider: true,
|
||||
},
|
||||
{
|
||||
label: formatMessage(labels.customRange),
|
||||
label: t(labels.customRange),
|
||||
value: 'custom',
|
||||
divider: true,
|
||||
},
|
||||
@@ -107,7 +107,7 @@ export function DateFilter({
|
||||
<Select
|
||||
{...props}
|
||||
value={selectedValue}
|
||||
placeholder={formatMessage(labels.selectDate)}
|
||||
placeholder={t(labels.selectDate)}
|
||||
onChange={handleChange}
|
||||
renderValue={renderValue}
|
||||
popoverProps={{ placement, style: { minWidth: 200 } }}
|
||||
|
||||
@@ -11,7 +11,7 @@ export function DownloadButton({
|
||||
data?: any;
|
||||
onClick?: () => void;
|
||||
}) {
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
|
||||
const handleClick = async () => {
|
||||
downloadCsv(`${filename}.csv`, Papa.unparse(data));
|
||||
@@ -25,7 +25,7 @@ export function DownloadButton({
|
||||
</Icon>
|
||||
</Button>
|
||||
<Tooltip>
|
||||
<Text size="sm">{formatMessage(labels.download)}</Text>
|
||||
<Text size="sm">{t(labels.download)}</Text>
|
||||
</Tooltip>
|
||||
</TooltipTrigger>
|
||||
);
|
||||
|
||||
@@ -7,7 +7,7 @@ import { useFilterParameters } from '@/components/hooks/useFilterParameters';
|
||||
import { Download } from '@/components/icons';
|
||||
|
||||
export function ExportButton({ websiteId }: { websiteId: string }) {
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
const date = useDateParameters();
|
||||
const filters = useFilterParameters();
|
||||
@@ -41,7 +41,7 @@ export function ExportButton({ websiteId }: { websiteId: string }) {
|
||||
<Download />
|
||||
</Icon>
|
||||
</LoadingButton>
|
||||
<Tooltip>{formatMessage(labels.download)}</Tooltip>
|
||||
<Tooltip>{t(labels.download)}</Tooltip>
|
||||
</TooltipTrigger>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ export interface FieldFiltersProps {
|
||||
}
|
||||
|
||||
export function FieldFilters({ websiteId, value, exclude = [], onChange }: FieldFiltersProps) {
|
||||
const { formatMessage, messages } = useMessages();
|
||||
const { t, messages } = useMessages();
|
||||
const { fields, groupLabels } = useFields();
|
||||
const startDate = subMonths(endOfDay(new Date()), 6);
|
||||
const endDate = endOfDay(new Date());
|
||||
@@ -143,7 +143,7 @@ export function FieldFilters({ websiteId, value, exclude = [], onChange }: Field
|
||||
/>
|
||||
);
|
||||
})}
|
||||
{!value.length && <Empty message={formatMessage(messages.nothingSelected)} />}
|
||||
{!value.length && <Empty message={t(messages.nothingSelected)} />}
|
||||
</Column>
|
||||
</Grid>
|
||||
);
|
||||
|
||||
@@ -21,7 +21,7 @@ import { Bookmark, X } from '@/components/icons';
|
||||
import { isSearchOperator } from '@/lib/params';
|
||||
|
||||
export function FilterBar({ websiteId }: { websiteId: string }) {
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
const { formatValue } = useFormat();
|
||||
const {
|
||||
router,
|
||||
@@ -62,7 +62,7 @@ export function FilterBar({ websiteId }: { websiteId: string }) {
|
||||
{segment && !isLoading && (
|
||||
<FilterItem
|
||||
name="segment"
|
||||
label={formatMessage(labels.segment)}
|
||||
label={t(labels.segment)}
|
||||
value={data?.name || segment}
|
||||
operator={operatorLabels.eq}
|
||||
onRemove={() => handleSegmentRemove('segment')}
|
||||
@@ -71,7 +71,7 @@ export function FilterBar({ websiteId }: { websiteId: string }) {
|
||||
{cohort && !isLoading && (
|
||||
<FilterItem
|
||||
name="cohort"
|
||||
label={formatMessage(labels.cohort)}
|
||||
label={t(labels.cohort)}
|
||||
value={data?.name || cohort}
|
||||
operator={operatorLabels.eq}
|
||||
onRemove={() => handleSegmentRemove('cohort')}
|
||||
@@ -103,12 +103,12 @@ export function FilterBar({ websiteId }: { websiteId: string }) {
|
||||
</Icon>
|
||||
</Button>
|
||||
<Tooltip>
|
||||
<Text>{formatMessage(labels.saveSegment)}</Text>
|
||||
<Text>{t(labels.saveSegment)}</Text>
|
||||
</Tooltip>
|
||||
</TooltipTrigger>
|
||||
)}
|
||||
<Modal>
|
||||
<Dialog title={formatMessage(labels.segment)} style={{ width: 800, minHeight: 300 }}>
|
||||
<Dialog title={t(labels.segment)} style={{ width: 800, minHeight: 300 }}>
|
||||
{({ close }) => {
|
||||
return <SegmentEditForm websiteId={websiteId} onClose={close} filters={filters} />;
|
||||
}}
|
||||
@@ -122,7 +122,7 @@ export function FilterBar({ websiteId }: { websiteId: string }) {
|
||||
</Icon>
|
||||
</Button>
|
||||
<Tooltip>
|
||||
<Text>{formatMessage(labels.clearAll)}</Text>
|
||||
<Text>{t(labels.clearAll)}</Text>
|
||||
</Tooltip>
|
||||
</TooltipTrigger>
|
||||
</Row>
|
||||
|
||||
@@ -16,7 +16,7 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormP
|
||||
pathname,
|
||||
} = useNavigation();
|
||||
const { filters } = useFilters();
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
const [currentFilters, setCurrentFilters] = useState(filters);
|
||||
const [currentSegment, setCurrentSegment] = useState(segment);
|
||||
const [currentCohort, setCurrentCohort] = useState(cohort);
|
||||
@@ -49,11 +49,11 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormP
|
||||
<Column minHeight="500px">
|
||||
<Tabs>
|
||||
<TabList>
|
||||
<Tab id="fields">{formatMessage(labels.fields)}</Tab>
|
||||
<Tab id="fields">{t(labels.fields)}</Tab>
|
||||
{!excludeFilters && (
|
||||
<>
|
||||
<Tab id="segments">{formatMessage(labels.segments)}</Tab>
|
||||
<Tab id="cohorts">{formatMessage(labels.cohorts)}</Tab>
|
||||
<Tab id="segments">{t(labels.segments)}</Tab>
|
||||
<Tab id="cohorts">{t(labels.cohorts)}</Tab>
|
||||
</>
|
||||
)}
|
||||
</TabList>
|
||||
@@ -89,11 +89,11 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormP
|
||||
</Tabs>
|
||||
</Column>
|
||||
<Row alignItems="center" justifyContent="space-between" gap>
|
||||
<Button onPress={handleReset}>{formatMessage(labels.reset)}</Button>
|
||||
<Button onPress={handleReset}>{t(labels.reset)}</Button>
|
||||
<Row alignItems="center" justifyContent="flex-end" gridColumn="span 2" gap>
|
||||
<Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>
|
||||
<Button onPress={onClose}>{t(labels.cancel)}</Button>
|
||||
<Button variant="primary" onPress={handleSave}>
|
||||
{formatMessage(labels.apply)}
|
||||
{t(labels.apply)}
|
||||
</Button>
|
||||
</Row>
|
||||
</Row>
|
||||
|
||||
@@ -12,7 +12,7 @@ export interface LookupFieldProps extends ComboBoxProps {
|
||||
}
|
||||
|
||||
export function LookupField({ websiteId, type, value, onChange, ...props }: LookupFieldProps) {
|
||||
const { formatMessage, messages } = useMessages();
|
||||
const { t, messages } = useMessages();
|
||||
const [search, setSearch] = useState(value);
|
||||
const searchValue = useDebounce(search, 300);
|
||||
const startDate = subMonths(endOfDay(new Date()), 6);
|
||||
@@ -51,7 +51,7 @@ export function LookupField({ websiteId, type, value, onChange, ...props }: Look
|
||||
isLoading ? (
|
||||
<Loading placement="center" icon="dots" />
|
||||
) : (
|
||||
<Empty message={formatMessage(messages.noResultsFound)} />
|
||||
<Empty message={t(messages.noResultsFound)} />
|
||||
)
|
||||
}
|
||||
>
|
||||
|
||||
@@ -45,7 +45,7 @@ export interface TeamsButtonProps {
|
||||
export function NavButton({ showText = true }: TeamsButtonProps) {
|
||||
const { user } = useLoginQuery();
|
||||
const { cloudMode } = useConfig();
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
const { teamId, router } = useNavigation();
|
||||
const { isMobile } = useMobile();
|
||||
const team = user?.teams?.find(({ id }) => id === teamId);
|
||||
@@ -98,18 +98,18 @@ export function NavButton({ showText = true }: TeamsButtonProps) {
|
||||
<Menu autoFocus="last">
|
||||
<SubmenuTrigger>
|
||||
<MenuItem id="teams" showChecked={false} showSubMenuIcon>
|
||||
<IconLabel icon={<Switch />} label={formatMessage(labels.switchAccount)} />
|
||||
<IconLabel icon={<Switch />} label={t(labels.switchAccount)} />
|
||||
</MenuItem>
|
||||
<Popover placement={isMobile ? 'bottom start' : 'right top'}>
|
||||
<Column minWidth="300px">
|
||||
<Menu selectionMode="single" selectedKeys={selectedKeys} onAction={handleAction}>
|
||||
<MenuSection title={formatMessage(labels.myAccount)}>
|
||||
<MenuSection title={t(labels.myAccount)}>
|
||||
<MenuItem id="user">
|
||||
<IconLabel icon={<User />} label={user.username} />
|
||||
</MenuItem>
|
||||
</MenuSection>
|
||||
<MenuSeparator />
|
||||
<MenuSection title={formatMessage(labels.teams)}>
|
||||
<MenuSection title={t(labels.teams)}>
|
||||
{user?.teams?.map(({ id, name }) => (
|
||||
<MenuItem key={id} id={id} href={getUrl(`/teams/${id}`)}>
|
||||
<IconLabel icon={<Users />}>
|
||||
@@ -139,7 +139,7 @@ export function NavButton({ showText = true }: TeamsButtonProps) {
|
||||
id="settings"
|
||||
href={getUrl('/settings')}
|
||||
icon={<Settings />}
|
||||
label={formatMessage(labels.settings)}
|
||||
label={t(labels.settings)}
|
||||
/>
|
||||
{cloudMode && (
|
||||
<>
|
||||
@@ -148,7 +148,7 @@ export function NavButton({ showText = true }: TeamsButtonProps) {
|
||||
href={DOCS_URL}
|
||||
target="_blank"
|
||||
icon={<BookText />}
|
||||
label={formatMessage(labels.documentation)}
|
||||
label={t(labels.documentation)}
|
||||
>
|
||||
<Icon color="muted">
|
||||
<ExternalLink />
|
||||
@@ -158,7 +158,7 @@ export function NavButton({ showText = true }: TeamsButtonProps) {
|
||||
id="support"
|
||||
href={getUrl('/settings/support')}
|
||||
icon={<LifeBuoy />}
|
||||
label={formatMessage(labels.support)}
|
||||
label={t(labels.support)}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
@@ -169,7 +169,7 @@ export function NavButton({ showText = true }: TeamsButtonProps) {
|
||||
id="/admin"
|
||||
href="/admin"
|
||||
icon={<LockKeyhole />}
|
||||
label={formatMessage(labels.admin)}
|
||||
label={t(labels.admin)}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
@@ -178,7 +178,7 @@ export function NavButton({ showText = true }: TeamsButtonProps) {
|
||||
id="logout"
|
||||
href={getUrl('/logout')}
|
||||
icon={<LogOut />}
|
||||
label={formatMessage(labels.logout)}
|
||||
label={t(labels.logout)}
|
||||
/>
|
||||
</Menu>
|
||||
</Column>
|
||||
|
||||
@@ -6,7 +6,7 @@ import { useMessages } from '@/components/hooks';
|
||||
import { Settings } from '@/components/icons';
|
||||
|
||||
export function PreferencesButton() {
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
|
||||
return (
|
||||
<DialogTrigger>
|
||||
@@ -18,11 +18,11 @@ export function PreferencesButton() {
|
||||
<Popover placement="bottom end">
|
||||
<Panel gap="3">
|
||||
<Column>
|
||||
<Label>{formatMessage(labels.timezone)}</Label>
|
||||
<Label>{t(labels.timezone)}</Label>
|
||||
<TimezoneSetting />
|
||||
</Column>
|
||||
<Column>
|
||||
<Label>{formatMessage(labels.defaultDateRange)}</Label>
|
||||
<Label>{t(labels.defaultDateRange)}</Label>
|
||||
<DateRangeSetting />
|
||||
</Column>
|
||||
</Panel>
|
||||
|
||||
@@ -15,27 +15,27 @@ import { useLoginQuery, useMessages, useNavigation } from '@/components/hooks';
|
||||
import { LockKeyhole, LogOut, UserCircle } from '@/components/icons';
|
||||
|
||||
export function ProfileButton() {
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
const { user } = useLoginQuery();
|
||||
const { renderUrl } = useNavigation();
|
||||
|
||||
const items = [
|
||||
{
|
||||
id: 'settings',
|
||||
label: formatMessage(labels.profile),
|
||||
label: t(labels.profile),
|
||||
path: renderUrl('/settings/profile'),
|
||||
icon: <UserCircle />,
|
||||
},
|
||||
user.isAdmin &&
|
||||
!process.env.cloudMode && {
|
||||
id: 'admin',
|
||||
label: formatMessage(labels.admin),
|
||||
label: t(labels.admin),
|
||||
path: '/admin',
|
||||
icon: <LockKeyhole />,
|
||||
},
|
||||
{
|
||||
id: 'logout',
|
||||
label: formatMessage(labels.logout),
|
||||
label: t(labels.logout),
|
||||
path: '/logout',
|
||||
icon: <LogOut />,
|
||||
separator: true,
|
||||
|
||||
@@ -10,7 +10,7 @@ export function RefreshButton({
|
||||
websiteId: string;
|
||||
isLoading?: boolean;
|
||||
}) {
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
const { dateRange } = useDateRange();
|
||||
|
||||
function handleClick() {
|
||||
@@ -26,7 +26,7 @@ export function RefreshButton({
|
||||
<RefreshCw />
|
||||
</Icon>
|
||||
</LoadingButton>
|
||||
<Tooltip>{formatMessage(labels.refresh)}</Tooltip>
|
||||
<Tooltip>{t(labels.refresh)}</Tooltip>
|
||||
</TooltipTrigger>
|
||||
);
|
||||
}
|
||||
@@ -28,7 +28,7 @@ export function ReportEditButton({
|
||||
onDelete?: () => void;
|
||||
children: ({ close }: { close: () => void }) => ReactNode;
|
||||
}) {
|
||||
const { formatMessage, labels, messages } = useMessages();
|
||||
const { t, labels, messages } = useMessages();
|
||||
const [showEdit, setShowEdit] = useState(false);
|
||||
const [showDelete, setShowDelete] = useState(false);
|
||||
const { mutateAsync, touch } = useDeleteQuery(`/reports/${id}`);
|
||||
@@ -70,13 +70,13 @@ export function ReportEditButton({
|
||||
<Icon>
|
||||
<Edit />
|
||||
</Icon>
|
||||
<Text>{formatMessage(labels.edit)}</Text>
|
||||
<Text>{t(labels.edit)}</Text>
|
||||
</MenuItem>
|
||||
<MenuItem id="delete">
|
||||
<Icon>
|
||||
<Trash />
|
||||
</Icon>
|
||||
<Text>{formatMessage(labels.delete)}</Text>
|
||||
<Text>{t(labels.delete)}</Text>
|
||||
</MenuItem>
|
||||
</Menu>
|
||||
</Popover>
|
||||
@@ -85,12 +85,12 @@ export function ReportEditButton({
|
||||
{showEdit && children({ close: handleClose })}
|
||||
{showDelete && (
|
||||
<AlertDialog
|
||||
title={formatMessage(labels.delete)}
|
||||
title={t(labels.delete)}
|
||||
onConfirm={handleDelete}
|
||||
onCancel={handleClose}
|
||||
isDanger
|
||||
>
|
||||
<Row gap="1">{formatMessage(messages.confirmDelete, { target: name })}</Row>
|
||||
<Row gap="1">{t(messages.confirmDelete, { target: name })}</Row>
|
||||
</AlertDialog>
|
||||
)}
|
||||
</Modal>
|
||||
|
||||
@@ -4,7 +4,7 @@ import { useMessages } from '@/components/hooks';
|
||||
import { Plus } from '@/components/icons';
|
||||
|
||||
export function SegmentSaveButton({ websiteId }: { websiteId: string }) {
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
|
||||
return (
|
||||
<DialogTrigger>
|
||||
@@ -12,10 +12,10 @@ export function SegmentSaveButton({ websiteId }: { websiteId: string }) {
|
||||
<Icon>
|
||||
<Plus />
|
||||
</Icon>
|
||||
<Text>{formatMessage(labels.segment)}</Text>
|
||||
<Text>{t(labels.segment)}</Text>
|
||||
</Button>
|
||||
<Modal>
|
||||
<Dialog title={formatMessage(labels.segment)} style={{ width: 800 }}>
|
||||
<Dialog title={t(labels.segment)} style={{ width: 800 }}>
|
||||
{({ close }) => {
|
||||
return <SegmentEditForm websiteId={websiteId} onClose={close} />;
|
||||
}}
|
||||
|
||||
@@ -22,7 +22,7 @@ import {
|
||||
import { DOCS_URL } from '@/lib/constants';
|
||||
|
||||
export function SettingsButton() {
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
const { user } = useLoginQuery();
|
||||
const { router } = useNavigation();
|
||||
const { cloudMode } = useConfig();
|
||||
@@ -52,30 +52,22 @@ export function SettingsButton() {
|
||||
<Menu autoFocus="last" onAction={handleAction}>
|
||||
<MenuSection title={user.username}>
|
||||
<MenuSeparator />
|
||||
<MenuItem id="/settings" icon={<Settings />} label={formatMessage(labels.settings)} />
|
||||
<MenuItem id="/settings" icon={<Settings />} label={t(labels.settings)} />
|
||||
{!cloudMode && user.isAdmin && (
|
||||
<MenuItem id="/admin" icon={<LockKeyhole />} label={formatMessage(labels.admin)} />
|
||||
<MenuItem id="/admin" icon={<LockKeyhole />} label={t(labels.admin)} />
|
||||
)}
|
||||
{cloudMode && (
|
||||
<>
|
||||
<MenuItem
|
||||
id="/docs"
|
||||
icon={<BookText />}
|
||||
label={formatMessage(labels.documentation)}
|
||||
>
|
||||
<MenuItem id="/docs" icon={<BookText />} label={t(labels.documentation)}>
|
||||
<Icon color="muted">
|
||||
<ExternalLink />
|
||||
</Icon>
|
||||
</MenuItem>
|
||||
<MenuItem
|
||||
id="/settings/support"
|
||||
icon={<LifeBuoy />}
|
||||
label={formatMessage(labels.support)}
|
||||
/>
|
||||
<MenuItem id="/settings/support" icon={<LifeBuoy />} label={t(labels.support)} />
|
||||
</>
|
||||
)}
|
||||
<MenuSeparator />
|
||||
<MenuItem id="/logout" icon={<LogOut />} label={formatMessage(labels.logout)} />
|
||||
<MenuItem id="/logout" icon={<LogOut />} label={t(labels.logout)} />
|
||||
</MenuSection>
|
||||
</Menu>
|
||||
</Popover>
|
||||
|
||||
@@ -4,7 +4,7 @@ import { DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE_VALUE } from '@/lib/constants';
|
||||
import { getItem } from '@/lib/storage';
|
||||
|
||||
export function UnitFilter() {
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
const { router, query, updateParams } = useNavigation();
|
||||
|
||||
const DATE_RANGE_UNIT_CONFIG = {
|
||||
@@ -47,7 +47,7 @@ export function UnitFilter() {
|
||||
|
||||
const options = unitConfig.availableUnits.map(unit => ({
|
||||
id: unit,
|
||||
label: formatMessage(labels[unit]),
|
||||
label: t(labels[unit]),
|
||||
}));
|
||||
|
||||
const selectedUnit = query.unit ?? unitConfig.defaultUnit;
|
||||
|
||||
@@ -10,7 +10,7 @@ export function UserSelect({
|
||||
}: {
|
||||
teamId?: string;
|
||||
} & SelectProps) {
|
||||
const { formatMessage, messages } = useMessages();
|
||||
const { t, messages } = useMessages();
|
||||
const { data: users, isLoading: usersLoading } = useUsersQuery();
|
||||
const { data: teamMembers, isLoading: teamMembersLoading } = useTeamMembersQuery(teamId);
|
||||
const [username, setUsername] = useState<string>();
|
||||
@@ -51,7 +51,7 @@ export function UserSelect({
|
||||
onChange={handleChange}
|
||||
onOpenChange={handleOpenChange}
|
||||
listProps={{
|
||||
renderEmptyState: () => <Empty message={formatMessage(messages.noResultsFound)} />,
|
||||
renderEmptyState: () => <Empty message={t(messages.noResultsFound)} />,
|
||||
style: { maxHeight: 'calc(42vh - 65px)' },
|
||||
}}
|
||||
>
|
||||
|
||||
@@ -21,7 +21,7 @@ export function WebsiteDateFilter({
|
||||
allowCompare,
|
||||
}: WebsiteDateFilterProps) {
|
||||
const { dateRange, isAllTime, isCustomRange } = useDateRange();
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
const {
|
||||
router,
|
||||
updateParams,
|
||||
@@ -93,8 +93,8 @@ export function WebsiteDateFilter({
|
||||
style={{ width: 200 }}
|
||||
popoverProps={{ style: { width: 200 } }}
|
||||
>
|
||||
<ListItem id="prev">{formatMessage(labels.previousPeriod)}</ListItem>
|
||||
<ListItem id="yoy">{formatMessage(labels.previousYear)}</ListItem>
|
||||
<ListItem id="prev">{t(labels.previousPeriod)}</ListItem>
|
||||
<ListItem id="yoy">{t(labels.previousYear)}</ListItem>
|
||||
</Select>
|
||||
</Row>
|
||||
</Row>
|
||||
|
||||
@@ -13,7 +13,7 @@ export function WebsiteFilterButton({
|
||||
position?: 'bottom' | 'top' | 'left' | 'right';
|
||||
alignment?: 'end' | 'center' | 'start';
|
||||
}) {
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { t, labels } = useMessages();
|
||||
const { updateParams, pathname, router, query } = useNavigation();
|
||||
const [excludeBounce, setExcludeBounce] = useState(!!query.excludeBounce);
|
||||
const isOverview =
|
||||
@@ -33,7 +33,7 @@ export function WebsiteFilterButton({
|
||||
};
|
||||
|
||||
return (
|
||||
<DialogButton icon={<ListFilter />} label={formatMessage(labels.filter)} variant="outline">
|
||||
<DialogButton icon={<ListFilter />} label={t(labels.filter)} variant="outline">
|
||||
{({ close }) => {
|
||||
return (
|
||||
<>
|
||||
@@ -44,7 +44,7 @@ export function WebsiteFilterButton({
|
||||
onChange={setExcludeBounce}
|
||||
style={{ marginTop: '3px' }}
|
||||
>
|
||||
{formatMessage(labels.excludeBounce)}
|
||||
{t(labels.excludeBounce)}
|
||||
</Checkbox>
|
||||
</Row>
|
||||
)}
|
||||
|
||||
@@ -19,7 +19,7 @@ export function WebsiteSelect({
|
||||
teamId?: string;
|
||||
includeTeams?: boolean;
|
||||
} & SelectProps) {
|
||||
const { formatMessage, messages } = useMessages();
|
||||
const { t, messages } = useMessages();
|
||||
const { data: website } = useWebsiteQuery(websiteId);
|
||||
const [name, setName] = useState<string>(website?.name);
|
||||
const [search, setSearch] = useState('');
|
||||
@@ -63,7 +63,7 @@ export function WebsiteSelect({
|
||||
onOpenChange={handleOpenChange}
|
||||
renderValue={renderValue}
|
||||
listProps={{
|
||||
renderEmptyState: () => <Empty message={formatMessage(messages.noResultsFound)} />,
|
||||
renderEmptyState: () => <Empty message={t(messages.noResultsFound)} />,
|
||||
style: { maxHeight: 'calc(42vh - 65px)', width: 280 },
|
||||
}}
|
||||
buttonProps={{ style: { minHeight: 40 } }}
|
||||
|
||||
Reference in new issue
Block a user