mirror of
https://github.com/kremalicious/umami.git
synced 2025-02-14 21:10:34 +01:00
Merge branch 'master' into dev
This commit is contained in:
commit
ed0d778e97
@ -3,7 +3,7 @@ import Empty from 'components/common/Empty';
|
|||||||
import FilterButtons from 'components/common/FilterButtons';
|
import FilterButtons from 'components/common/FilterButtons';
|
||||||
import { useCountryNames, useLocale, useMessages, useTimezone } from 'components/hooks';
|
import { useCountryNames, useLocale, useMessages, useTimezone } from 'components/hooks';
|
||||||
import Icons from 'components/icons';
|
import Icons from 'components/icons';
|
||||||
import { BROWSERS } from 'lib/constants';
|
import { BROWSERS, OS_NAMES } from 'lib/constants';
|
||||||
import { stringToColor } from 'lib/format';
|
import { stringToColor } from 'lib/format';
|
||||||
import { RealtimeData } from 'lib/types';
|
import { RealtimeData } from 'lib/types';
|
||||||
import { safeDecodeURI } from 'next-basics';
|
import { safeDecodeURI } from 'next-basics';
|
||||||
@ -111,7 +111,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
|
|||||||
values={{
|
values={{
|
||||||
country: <b>{countryNames[country] || formatMessage(labels.unknown)}</b>,
|
country: <b>{countryNames[country] || formatMessage(labels.unknown)}</b>,
|
||||||
browser: <b>{BROWSERS[browser]}</b>,
|
browser: <b>{BROWSERS[browser]}</b>,
|
||||||
os: <b>{os}</b>,
|
os: <b>{OS_NAMES[os] || os}</b>,
|
||||||
device: <b>{formatMessage(labels[device] || labels.unknown)}</b>,
|
device: <b>{formatMessage(labels[device] || labels.unknown)}</b>,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
@ -311,7 +311,7 @@ export const BROWSERS = {
|
|||||||
instagram: 'Instagram',
|
instagram: 'Instagram',
|
||||||
ios: 'iOS',
|
ios: 'iOS',
|
||||||
'ios-webview': 'iOS (webview)',
|
'ios-webview': 'iOS (webview)',
|
||||||
kakaotalk: 'KaKaoTalk',
|
kakaotalk: 'KakaoTalk',
|
||||||
miui: 'MIUI',
|
miui: 'MIUI',
|
||||||
opera: 'Opera',
|
opera: 'Opera',
|
||||||
'opera-mini': 'Opera Mini',
|
'opera-mini': 'Opera Mini',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user