Merge 29b2dab1c3 into 097673b845

chore: i18n use cache key (#20885 )
* 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.
2025-12-20 12:06:43 +03:00 · 2025-11-14 14:38:33 -05:00 · 2025-11-14 09:36:46 -06:00 · 2025-11-14 09:23:43 -06:00
5 changed files with 5 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -15,6 +15,7 @@ frigate/version.py
 web/build
 web/node_modules
 web/coverage
+web/.env
 core
 !/web/**/*.ts
 .idea/*
--- a/1
+++ b/1
@ -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 . \
--- a/web/.gitignore
+++ b/web/.gitignore
@ -22,3 +22,4 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+.env
--- a/web/src/utils/i18n.ts
+++ b/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: [
--- a/web/src/views/settings/UiSettingsView.tsx
+++ b/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>
Author	SHA1	Message	Date
dependabot[bot]	1f4947d3d9	Merge `29b2dab1c3` into `097673b845`	2025-11-14 14:38:33 -05:00
GuoQing Liu	097673b845	chore: i18n use cache key (#20885 ) Some checks failed CI / AMD64 Build (push) Has been cancelled Details CI / ARM Build (push) Has been cancelled Details CI / Jetson Jetpack 6 (push) Has been cancelled Details CI / AMD64 Extra Build (push) Has been cancelled Details CI / ARM Extra Build (push) Has been cancelled Details CI / Synaptics Build (push) Has been cancelled Details CI / Assemble and push default build (push) Has been cancelled Details * 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.	2025-11-14 09:36:46 -06:00
GuoQing Liu	d56cf59b9a	fix: fix "Always Show Camera Names" label switch id wrong (#20922 )	2025-11-14 09:23:43 -06:00