From e373b8adc7369f10db9978beadb5d637491608e7 Mon Sep 17 00:00:00 2001 From: ZhaiSoul <842607283@qq.com> Date: Tue, 15 Apr 2025 15:36:35 +0000 Subject: [PATCH] revert: revert wrong label fix --- web/src/components/card/SearchThumbnail.tsx | 4 +--- web/src/components/filter/SearchFilterGroup.tsx | 4 ++-- web/src/components/input/InputWithTags.tsx | 4 ++-- web/src/components/overlay/detail/ReviewDetailDialog.tsx | 2 +- web/src/components/overlay/detail/SearchDetailDialog.tsx | 6 +++--- web/src/components/settings/ObjectMaskEditPane.tsx | 2 +- web/src/components/settings/ZoneEditPane.tsx | 2 +- web/src/views/explore/ExploreView.tsx | 2 +- web/src/views/settings/CameraSettingsView.tsx | 8 ++------ 9 files changed, 14 insertions(+), 20 deletions(-) diff --git a/web/src/components/card/SearchThumbnail.tsx b/web/src/components/card/SearchThumbnail.tsx index d17341ea23..a2c5cd37f0 100644 --- a/web/src/components/card/SearchThumbnail.tsx +++ b/web/src/components/card/SearchThumbnail.tsx @@ -127,9 +127,7 @@ export default function SearchThumbnail({ .filter( (item) => item !== undefined && !item.includes("-verified"), ) - .map((text) => - t(text.replace(" ", "_").toLowerCase(), { ns: "objects" }), - ) + .map((text) => t(text, { ns: "objects" })) .sort() .join(", ") .replaceAll("-verified", "")} diff --git a/web/src/components/filter/SearchFilterGroup.tsx b/web/src/components/filter/SearchFilterGroup.tsx index d818287072..63fea21b6b 100644 --- a/web/src/components/filter/SearchFilterGroup.tsx +++ b/web/src/components/filter/SearchFilterGroup.tsx @@ -248,7 +248,7 @@ function GeneralFilterButton({ } if (selectedLabels.length == 1) { - return t(selectedLabels[0].replace(" ", "_").toLowerCase(), { + return t(selectedLabels[0], { ns: "objects", }); } @@ -357,7 +357,7 @@ export function GeneralFilterContent({ {allLabels.map((item) => ( { if (isChecked) { diff --git a/web/src/components/input/InputWithTags.tsx b/web/src/components/input/InputWithTags.tsx index c177e1a0b0..62574de267 100644 --- a/web/src/components/input/InputWithTags.tsx +++ b/web/src/components/input/InputWithTags.tsx @@ -419,7 +419,7 @@ export default function InputWithTags({ ? t("button.yes", { ns: "common" }) : t("button.no", { ns: "common" }); } else if (filterType === "labels") { - return t((filterValues as string).replace(" ", "_").toLowerCase(), { + return t(filterValues as string, { ns: "objects", }); } else if (filterType === "search_type") { @@ -809,7 +809,7 @@ export default function InputWithTags({ > {t("filter.label." + filterType)}:{" "} {filterType === "labels" - ? t(value.replace(" ", "_").toLowerCase(), { + ? t(value, { ns: "objects", }) : value.replaceAll("_", " ")} diff --git a/web/src/components/overlay/detail/ReviewDetailDialog.tsx b/web/src/components/overlay/detail/ReviewDetailDialog.tsx index 51ffa04c82..065006eabe 100644 --- a/web/src/components/overlay/detail/ReviewDetailDialog.tsx +++ b/web/src/components/overlay/detail/ReviewDetailDialog.tsx @@ -325,7 +325,7 @@ export default function ReviewDetailDialog({ values={{ objects: missingObjects .map((x) => - t(x.replace(" ", "_").toLowerCase(), { + t(x, { ns: "objects", }), ) diff --git a/web/src/components/overlay/detail/SearchDetailDialog.tsx b/web/src/components/overlay/detail/SearchDetailDialog.tsx index 6be09f4a4e..dd2180cbb2 100644 --- a/web/src/components/overlay/detail/SearchDetailDialog.tsx +++ b/web/src/components/overlay/detail/SearchDetailDialog.tsx @@ -690,7 +690,7 @@ function ObjectDetailsTab({
{t("details.label")}
{getIconForLabel(search.label, "size-4 text-primary")} - {t(search.label.replace(" ", "_").toLowerCase(), { + {t(search.label, { ns: "objects", })} {search.sub_label && ` (${search.sub_label})`} @@ -953,7 +953,7 @@ function ObjectDetailsTab({ description={ search.label ? t("details.editSubLabel.desc", { - label: t(search.label.replace(" ", "_").toLowerCase(), { + label: t(search.label, { ns: "objects", }), }) @@ -970,7 +970,7 @@ function ObjectDetailsTab({ description={ search.label ? t("details.editLPR.desc", { - label: t(search.label.replace(" ", "_").toLowerCase(), { + label: t(search.label, { ns: "objects", }), }) diff --git a/web/src/components/settings/ObjectMaskEditPane.tsx b/web/src/components/settings/ObjectMaskEditPane.tsx index 3046752bdc..9a3c3295f5 100644 --- a/web/src/components/settings/ObjectMaskEditPane.tsx +++ b/web/src/components/settings/ObjectMaskEditPane.tsx @@ -448,7 +448,7 @@ export function ZoneObjectSelector({ camera }: ZoneObjectSelectorProps) { {allLabels.map((item) => ( - {t(item.replace(" ", "_").toLowerCase(), { ns: "objects" })} + {t(item, { ns: "objects" })} ))} diff --git a/web/src/components/settings/ZoneEditPane.tsx b/web/src/components/settings/ZoneEditPane.tsx index 5907afd24c..c6eefaf6d5 100644 --- a/web/src/components/settings/ZoneEditPane.tsx +++ b/web/src/components/settings/ZoneEditPane.tsx @@ -936,7 +936,7 @@ export function ZoneObjectSelector({ className="w-full cursor-pointer capitalize text-primary" htmlFor={item} > - {t(item.replace(" ", "_").toLowerCase(), { ns: "objects" })} + {t(item, { ns: "objects" })}
- {t(objectType.replace(" ", "_").toLowerCase(), { ns: "objects" })} + {t(objectType, { ns: "objects" })} {searchResults && ( {t("trackedObjectsCount", { diff --git a/web/src/views/settings/CameraSettingsView.tsx b/web/src/views/settings/CameraSettingsView.tsx index f78851d5e5..74cd212b85 100644 --- a/web/src/views/settings/CameraSettingsView.tsx +++ b/web/src/views/settings/CameraSettingsView.tsx @@ -79,9 +79,7 @@ export default function CameraSettingsView({ const alertsLabels = useMemo(() => { return cameraConfig?.review.alerts.labels ? cameraConfig.review.alerts.labels - .map((label) => - t(label.replace(" ", "_").toLowerCase(), { ns: "objects" }), - ) + .map((label) => t(label, { ns: "objects" })) .join(", ") : ""; }, [cameraConfig, t]); @@ -89,9 +87,7 @@ export default function CameraSettingsView({ const detectionsLabels = useMemo(() => { return cameraConfig?.review.detections.labels ? cameraConfig.review.detections.labels - .map((label) => - t(label.replace(" ", "_").toLowerCase(), { ns: "objects" }), - ) + .map((label) => t(label, { ns: "objects" })) .join(", ") : ""; }, [cameraConfig, t]);