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

Merge branch 'dev' of https://github.com/umami-software/umami into dev

Browse source
This commit is contained in:
Mike Cao 2023-12-19 23:20:14 -08:00
commit 479ce985a9
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.tsx
View file

@ -65,7 +65,7 @@ export function TeamWebsiteAddForm({
</GridColumn> </GridColumn>
</WebsitesDataTable> </WebsitesDataTable>
<FormButtons flex> <FormButtons flex>
<SubmitButton disabled={selected?.length === 0}> <SubmitButton variant="primary" disabled={selected?.length === 0}>
{formatMessage(labels.addWebsite)} {formatMessage(labels.addWebsite)}
</SubmitButton> </SubmitButton>
<Button onClick={onClose}>{formatMessage(labels.cancel)}</Button> <Button onClick={onClose}>{formatMessage(labels.cancel)}</Button>

4
src/components/hooks/useFormat.ts
View file

@ -2,7 +2,7 @@ import useMessages from './useMessages';
import { BROWSERS } from 'lib/constants'; import { BROWSERS } from 'lib/constants';
import useLocale from './useLocale'; import useLocale from './useLocale';
import useCountryNames from './useCountryNames'; import useCountryNames from './useCountryNames';
import regions from 'public/iso-3166-2.json'; import regions from '../../../public/iso-3166-2.json';
export function useFormat() { export function useFormat() {
const { formatMessage, labels } = useMessages(); const { formatMessage, labels } = useMessages();
@ -23,7 +23,7 @@ export function useFormat() {
}; };
const formatCity = (value: string, country?: string): string => { const formatCity = (value: string, country?: string): string => {
return `${value}, ${countryNames[country]}`; return countryNames[country] ? `${value}, ${countryNames[country]}` : value;
}; };
const formatDevice = (value: string): string => { const formatDevice = (value: string): string => {

2
src/components/metrics/RegionsTable.tsx
View file

@ -4,7 +4,7 @@ import useLocale from 'components/hooks/useLocale';
import useMessages from 'components/hooks/useMessages'; import useMessages from 'components/hooks/useMessages';
import useCountryNames from 'components/hooks/useCountryNames'; import useCountryNames from 'components/hooks/useCountryNames';
import MetricsTable, { MetricsTableProps } from './MetricsTable'; import MetricsTable, { MetricsTableProps } from './MetricsTable';
import regions from 'public/iso-3166-2.json'; import regions from '../../../public/iso-3166-2.json';
export function RegionsTable(props: MetricsTableProps) { export function RegionsTable(props: MetricsTableProps) {
const { locale } = useLocale(); const { locale } = useLocale();