administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-04-10 00:57:38 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Use new timeformat hook

Browse Source
This commit is contained in:
0x464e 2026-04-05 15:23:41 +03:00
parent 8d462588fc
commit 02de01261e
No known key found for this signature in database
GPG Key ID: E6D221DF6CBFBFFA
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/components/overlay/ShareTimestampDialog.tsx
View File

@ -16,7 +16,7 @@ import {
} from "@/components/ui/popover"; } from "@/components/ui/popover";
import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group"; import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
import { Separator } from "@/components/ui/separator"; import { Separator } from "@/components/ui/separator";
import { useFormattedTimestamp } from "@/hooks/use-date-utils"; import { useFormattedTimestamp, useTimeFormat } from "@/hooks/use-date-utils";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { FrigateConfig } from "@/types/frigateConfig"; import { FrigateConfig } from "@/types/frigateConfig";
import { getUTCOffset } from "@/utils/dateUtil"; import { getUTCOffset } from "@/utils/dateUtil";
@ -120,9 +120,10 @@ export function ShareTimestampContent({
}: Readonly<ShareTimestampContentProps>) { }: Readonly<ShareTimestampContentProps>) {
const { t } = useTranslation(["common", "components/dialog"]); const { t } = useTranslation(["common", "components/dialog"]);
const { data: config } = useSWR<FrigateConfig>("config"); const { data: config } = useSWR<FrigateConfig>("config");
const timeFormat = useTimeFormat(config);
const currentTimestampLabel = useFormattedTimestamp( const currentTimestampLabel = useFormattedTimestamp(
currentTime, currentTime,
config?.ui.time_format == "24hour" timeFormat == "24hour"
? t("time.formattedTimestamp.24hour") ? t("time.formattedTimestamp.24hour")
: t("time.formattedTimestamp.12hour"), : t("time.formattedTimestamp.12hour"),
config?.ui.timezone, config?.ui.timezone,
@ -236,6 +237,7 @@ function CustomTimestampSelector({
}: Readonly<CustomTimestampSelectorProps>) { }: Readonly<CustomTimestampSelectorProps>) {
const { t } = useTranslation(["common"]); const { t } = useTranslation(["common"]);
const { data: config } = useSWR<FrigateConfig>("config"); const { data: config } = useSWR<FrigateConfig>("config");
const timeFormat = useTimeFormat(config);
const timezoneOffset = useMemo( const timezoneOffset = useMemo(
() => () =>
@ -271,7 +273,7 @@ function CustomTimestampSelector({
const formattedTimestamp = useFormattedTimestamp( const formattedTimestamp = useFormattedTimestamp(
displayTimestamp, displayTimestamp,
config?.ui.time_format == "24hour" timeFormat == "24hour"
? t("time.formattedTimestamp.24hour") ? t("time.formattedTimestamp.24hour")
: t("time.formattedTimestamp.12hour"), : t("time.formattedTimestamp.12hour"),
); );