Merge 777b01bb05 into 097673b845

* chore: i18n use cache key

* Fix indentation in Dockerfile for pip command

* Add build argument for GIT_COMMIT_HASH in CI workflow

* Add short-sha output to action.yml

* Update build args to use short SHA output

* build: use vite .env

* Remove unnecessary newline in Dockerfile

* Define proxy host variable in vite.config.ts

Add a new line to define the proxy host variable.

.gitignore

@@ -15,6 +15,7 @@ frigate/version.py
 web/build
 web/node_modules
 web/coverage
+web/.env
 core
 !/web/**/*.ts
 .idea/*

Makefile

@@ -14,6 +14,7 @@ push-boards: $(BOARDS:%=push-%)
 
 version:
 	echo 'VERSION = "$(VERSION)-$(COMMIT_HASH)"' > frigate/version.py
+	echo 'VITE_GIT_COMMIT_HASH=$(COMMIT_HASH)' > web/.env
 
 local: version
 	docker buildx build --target=frigate --file docker/main/Dockerfile . \

web/.gitignore

@@ -22,3 +22,4 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+.env

web/public/notifications-worker.js

@@ -52,7 +52,7 @@ self.addEventListener("notificationclick", (event) => {
                 "X-CSRF-TOKEN": 1,
               },
               body: JSON.stringify({ ids: [event.notification.data.id] }),
-            })
+            }), // eslint-disable-line comma-dangle
           );
         }
         break;

web/src/pages/FaceLibrary.tsx

@@ -57,6 +57,7 @@ import { Trans, useTranslation } from "react-i18next";
 import {
   LuFolderCheck,
   LuImagePlus,
+  LuPencil,
   LuRefreshCw,
   LuScanFace,
   LuTrash2,
@@ -579,7 +580,9 @@ function LibrarySelector({
                         e.stopPropagation();
                         setRenameFace(face);
                       }}
-                    ></Button>
+                    >
+                      <LuPencil className="size-4 text-primary" />
+                    </Button>
                   </TooltipTrigger>
                   <TooltipPortal>
                     <TooltipContent>{t("button.renameFace")}</TooltipContent>
@@ -595,7 +598,9 @@ function LibrarySelector({
                         e.stopPropagation();
                         setConfirmDelete(face);
                       }}
-                    ></Button>
+                    >
+                      <LuTrash2 className="size-4 text-destructive" />
+                    </Button>
                   </TooltipTrigger>
                   <TooltipPortal>
                     <TooltipContent>{t("button.deleteFace")}</TooltipContent>

web/src/utils/i18n.ts

@@ -33,7 +33,7 @@ i18n
     fallbackLng: "en", // use en if detected lng is not available
 
     backend: {
-      loadPath: "locales/{{lng}}/{{ns}}.json",
+      loadPath: `locales/{{lng}}/{{ns}}.json?v=${import.meta.env.VITE_GIT_COMMIT_HASH || "unknown"}`,
     },
 
     ns: [

web/src/views/settings/UiSettingsView.tsx

@@ -157,7 +157,7 @@ export default function UiSettingsView() {
                   checked={cameraNames}
                   onCheckedChange={setCameraName}
                 />
-                <Label className="cursor-pointer" htmlFor="auto-live">
+                <Label className="cursor-pointer" htmlFor="camera-names">
                   {t("general.liveDashboard.displayCameraNames.label")}
                 </Label>
               </div>